core-3nweb-client-lib 0.42.3 → 0.42.5

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

@@ -1,9 +1,14 @@
 import { MailRecipient } from '../../../lib-client/asmail/recipient';
+import { Observable } from 'rxjs';
 import { LogError } from '../../../lib-client/logging/log-to-file';
+import { ConnectionStatus } from '../../../lib-common/ipc/ws-ipc';
 type IncomingMessage = web3n.asmail.IncomingMessage;
 type InboxEventType = web3n.asmail.InboxEventType;
 type Observer<T> = web3n.Observer<T>;
 type MsgInfo = web3n.asmail.MsgInfo;
+export interface InboxConnectionStatus extends ConnectionStatus {
+    service: 'inbox';
+}
 /**
  * Instance of this class handles event subscription from UI side. It observes
  * inbox server events, handles them, and generates respective events for UI
@@ -15,17 +20,19 @@ type MsgInfo = web3n.asmail.MsgInfo;
  * Hence, this should do restarts to server around wakeup events.
  */
 export declare class InboxEvents {
+    private readonly msgReceiver;
     private readonly getMsg;
-    private readonly listMsgs;
+    private readonly listNewMsgs;
     private readonly rmMsg;
     private readonly logError;
     private readonly newMsgs;
     private readonly newMsg$;
+    private readonly connectionEvents;
+    readonly connectionEvent$: Observable<InboxConnectionStatus>;
     private listeningProc;
-    private readonly makeServerEvents;
     private networkActive;
     private disconnectedAt;
-    constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, listMsgs: (fromTS: number) => Promise<MsgInfo[]>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
+    constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, listNewMsgs: (fromTS: number) => Promise<MsgInfo[]>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
     private startListening;
     private sleepAndRestart;
     private getMessage;

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

@@ -19,10 +19,16 @@ 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 ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
 const sleep_1 = require("../../../lib-common/processes/sleep");
+function toInboxConnectionStatus(status, params) {
+    return (0, ws_ipc_1.addToStatus)(status, {
+        service: 'inbox',
+        ...params
+    });
+}
 const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
 const BUFFER_MILLIS_FOR_LISTING = 2 * 60 * 1000;
 /**
@@ -36,17 +42,19 @@ const BUFFER_MILLIS_FOR_LISTING = 2 * 60 * 1000;
  * Hence, this should do restarts to server around wakeup events.
  */
 class InboxEvents {
-    constructor(msgReceiver, getMsg, listMsgs, rmMsg, logError) {
+    constructor(msgReceiver, getMsg, listNewMsgs, rmMsg, logError) {
+        this.msgReceiver = msgReceiver;
         this.getMsg = getMsg;
-        this.listMsgs = listMsgs;
+        this.listNewMsgs = listNewMsgs;
         this.rmMsg = rmMsg;
         this.logError = logError;
         this.newMsgs = new rxjs_1.Subject();
         this.newMsg$ = this.newMsgs.asObservable().pipe((0, operators_1.share)());
+        this.connectionEvents = new rxjs_1.Subject();
+        this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
         this.listeningProc = undefined;
         this.networkActive = true;
         this.disconnectedAt = undefined;
-        this.makeServerEvents = () => new server_events_1.ServerEvents(() => msgReceiver.openEventSource(this.logError));
         this.startListening();
         Object.seal(this);
     }
@@ -62,9 +70,14 @@ class InboxEvents {
                 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))
+        const sub = (0, rxjs_1.from)(this.msgReceiver.openEventSource().then(({ client, heartbeat }) => {
+            const channel = retrieval_1.msgRecievedCompletely.EVENT_NAME;
+            heartbeat.subscribe({
+                next: ev => this.connectionEvents.next(toInboxConnectionStatus(ev))
+            });
+            return new rxjs_1.Observable(obs => client.subscribe(channel, obs));
+        }))
+            .pipe((0, operators_1.mergeMap)(events => events), (0, operators_1.mergeMap)(async (ev) => this.getMessage(ev.msgId), 5))
             .subscribe({
             next: msg => {
                 if (msg) {
@@ -155,20 +168,27 @@ class InboxEvents {
         if (!this.disconnectedAt) {
             return;
         }
-        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));
-        for (const info of msgInfos) {
-            const msg = await this.getMessage(info.msgId);
-            if (msg) {
-                this.newMsgs.next(msg);
+        try {
+            const fromTS = this.disconnectedAt - BUFFER_MILLIS_FOR_LISTING;
+            const msgInfos = (await this.listNewMsgs(fromTS))
+                .sort((a, b) => (a.deliveryTS - b.deliveryTS));
+            for (const info of msgInfos) {
+                const msg = await this.getMessage(info.msgId);
+                if (msg) {
+                    this.newMsgs.next(msg);
+                    this.disconnectedAt = msg.deliveryTS;
+                }
+                else if (!this.networkActive) {
+                    return;
+                }
             }
-            else if (!this.networkActive) {
-                return;
+            this.disconnectedAt = undefined;
+        }
+        catch (err) {
+            if (err.type !== 'connect') {
+                await this.logError(err, `Error while retrieving messages, from disconnected period`);
             }
         }
-        this.disconnectedAt = undefined;
     }
 }
 exports.InboxEvents = InboxEvents;

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

@@ -94,9 +94,11 @@ export declare class InboxOnServer {
     private absorbSendingParams;
     private checkServerAuthIfPresent;
     private listMsgs;
+    private listNewMsgs;
     private getMsg;
     private msgToUIForm;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
+    get connectivityEvent$(): import("rxjs").Observable<import("./inbox-events").InboxConnectionStatus>;
 }
 export {};

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.listMsgs.bind(this), this.removeMsg.bind(this), this.logError);
+        this.inboxEvents = new inbox_events_1.InboxEvents(this.msgReceiver, this.getMsg.bind(this), this.listNewMsgs.bind(this), this.removeMsg.bind(this), this.logError);
         Object.seal(this);
     }
     static async makeAndStart(cachePath, syncedFS, r) {
@@ -237,6 +237,24 @@ class InboxOnServer {
             return this.index.listMsgs(fromTS);
         });
     }
+    async listNewMsgs(fromTS) {
+        const msgIds = await this.msgReceiver.listMsgs(fromTS);
+        // remove from listing messages already in index
+        const indexedMsgs = await this.index.listMsgs(fromTS);
+        for (const info of indexedMsgs) {
+            const ind = msgIds.indexOf(info.msgId);
+            if (ind >= 0) {
+                msgIds.splice(ind, 1);
+            }
+        }
+        if (msgIds.length === 0) {
+            return [];
+        }
+        // cache and index these
+        await Promise.all(msgIds.map(msgId => this.startCachingAndAddKeyToIndex(msgId)));
+        // get info's from index, focusing on specific messages only
+        return (await this.index.listMsgs(fromTS)).filter(({ msgId }) => msgIds.includes(msgId));
+    }
     async getMsg(msgId) {
         if (!msgId || (typeof msgId !== 'string')) {
             throw `Given message id is not a non-empty string`;
@@ -315,6 +333,9 @@ class InboxOnServer {
     resumeNetworkActivity() {
         this.inboxEvents.resumeNetworkActivity();
     }
+    get connectivityEvent$() {
+        return this.inboxEvents.connectionEvent$;
+    }
 }
 exports.InboxOnServer = InboxOnServer;
 Object.freeze(InboxOnServer.prototype);

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

@@ -31,5 +31,6 @@ export declare class ASMail {
     close(): Promise<void>;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
+    get connectivityEvent$(): import("rxjs").Observable<import("./inbox/inbox-events").InboxConnectionStatus>;
 }
 export {};

package/build/core/asmail/index.js

@@ -135,6 +135,9 @@ class ASMail {
     resumeNetworkActivity() {
         this.inbox.resumeNetworkActivity();
     }
+    get connectivityEvent$() {
+        return this.inbox.connectivityEvent$;
+    }
 }
 exports.ASMail = ASMail;
 Object.freeze(ASMail.prototype);

package/build/core/index.d.ts

@@ -47,5 +47,8 @@ export declare class Core {
     getStorages(): FactoryOfFSs;
     onDeviceSystemSuspend(): Promise<void>;
     onDeviceSystemResume(): Promise<void>;
+    get connectivityEvents(): {
+        inbox$: import("rxjs").Observable<import("./asmail/inbox/inbox-events").InboxConnectionStatus>;
+    };
 }
 export {};

package/build/core/index.js

@@ -334,6 +334,11 @@ class Core {
         this.storages.resumeNetworkActivity();
         this.asmail.resumeNetworkActivity();
     }
+    get connectivityEvents() {
+        return {
+            inbox$: this.asmail.connectivityEvent$
+        };
+    }
 }
 exports.Core = Core;
 Object.freeze(Core.prototype);

package/build/core/storage/common/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const CORE_APPS_PREFIX = "computer.3nweb.core";
+export declare const SYSTEM_PREFIX = "computer.3nweb";
 export declare const ASMAIL_APP_NAME = "computer.3nweb.core.asmail";
 export declare const KEYRINGS_APP_NAME = "computer.3nweb.core.keyrings";
 export declare const MAILERID_APP_NAME = "computer.3nweb.core.mailerid";

package/build/core/storage/common/constants.js

@@ -16,9 +16,10 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAILERID_APP_NAME = exports.KEYRINGS_APP_NAME = exports.ASMAIL_APP_NAME = exports.CORE_APPS_PREFIX = void 0;
-exports.CORE_APPS_PREFIX = 'computer.3nweb.core';
-exports.ASMAIL_APP_NAME = `${exports.CORE_APPS_PREFIX}.asmail`;
-exports.KEYRINGS_APP_NAME = `${exports.CORE_APPS_PREFIX}.keyrings`;
-exports.MAILERID_APP_NAME = `${exports.CORE_APPS_PREFIX}.mailerid`;
+exports.MAILERID_APP_NAME = exports.KEYRINGS_APP_NAME = exports.ASMAIL_APP_NAME = exports.SYSTEM_PREFIX = void 0;
+exports.SYSTEM_PREFIX = 'computer.3nweb';
+const CORE_APPS_PREFIX = `${exports.SYSTEM_PREFIX}.core`;
+exports.ASMAIL_APP_NAME = `${CORE_APPS_PREFIX}.asmail`;
+exports.KEYRINGS_APP_NAME = `${CORE_APPS_PREFIX}.keyrings`;
+exports.MAILERID_APP_NAME = `${CORE_APPS_PREFIX}.mailerid`;
 Object.freeze(exports);

package/build/core/storage/index.js

@@ -186,8 +186,8 @@ class StorageAndFS {
      * @param dst is a path starting with core app folder name
      */
     async migrateCoreAppDataOnFirstRun(src, dst) {
-        (0, assert_1.assert)(src.startsWith(constants_1.CORE_APPS_PREFIX) && !src.includes('..') &&
-            dst.startsWith(constants_1.CORE_APPS_PREFIX) && !dst.includes('..'), `Invalid core app data migration paths`);
+        (0, assert_1.assert)(src.startsWith(constants_1.SYSTEM_PREFIX) && !src.includes('..') &&
+            dst.startsWith(constants_1.SYSTEM_PREFIX) && !dst.includes('..'), `Invalid core app data migration paths`);
         if (!(await this.rootFS.checkFolderPresence(src))
             || !(await this.rootFS.checkFilePresence(src))
             || (await this.rootFS.checkFolderPresence(dst))
@@ -454,7 +454,7 @@ class PerAppStorage {
         if (typeof appFolder !== 'string') {
             throw makeBadAppNameExc(appFolder);
         }
-        if (appFolder.startsWith(constants_1.CORE_APPS_PREFIX)) {
+        if (appFolder.startsWith(constants_1.SYSTEM_PREFIX)) {
             throw makeNotAllowedToOpenAppFSExc(appFolder);
         }
         if (!this.policy.canOpenAppFS(appFolder, type)) {

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

@@ -1,7 +1,12 @@
+import { Observable } from 'rxjs';
 import { StorageOwner } from '../../../lib-client/3nstorage/storage-owner';
 import { ObjFiles } from './obj-files';
 import { Storage } from '../../../lib-client/xsp-fs/common';
 import { LogError } from '../../../lib-client/logging/log-to-file';
+import { ConnectionStatus } from '../../../lib-common/ipc/ws-ipc';
+export interface StorageConnectionStatus extends ConnectionStatus {
+    service: 'storage';
+}
 /**
  * Remote events are absorbed into objects' statuses, broadcasting respective
  * events. Someone down the stream can react to these changes from remote.
@@ -11,6 +16,8 @@ export declare class RemoteEvents {
     private readonly files;
     private readonly broadcastNodeEvent;
     private readonly logError;
+    private readonly connectionEvents;
+    readonly connectionEvent$: Observable<StorageConnectionStatus>;
     constructor(remoteStorage: StorageOwner, files: ObjFiles, broadcastNodeEvent: Storage['broadcastNodeEvent'], logError: LogError);
     private absorbingRemoteEventsProc;
     startAbsorbingRemoteEvents(): void;

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

@@ -18,9 +18,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteEvents = void 0;
 const rxjs_1 = require("rxjs");
-const server_events_1 = require("../../../lib-client/server-events");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 const operators_1 = require("rxjs/operators");
+const ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
+function toStorageConnectionStatus(status, params) {
+    return (0, ws_ipc_1.addToStatus)(status, {
+        service: 'storage',
+        ...params
+    });
+}
 const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
 /**
  * Remote events are absorbed into objects' statuses, broadcasting respective
@@ -32,16 +38,23 @@ class RemoteEvents {
         this.files = files;
         this.broadcastNodeEvent = broadcastNodeEvent;
         this.logError = logError;
+        this.connectionEvents = new rxjs_1.Subject();
+        this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
         this.absorbingRemoteEventsProc = undefined;
         Object.seal(this);
     }
     startAbsorbingRemoteEvents() {
-        const serverEvents = new server_events_1.ServerEvents(() => this.remoteStorage.openEventSource(this.logError));
-        this.absorbingRemoteEventsProc = (0, rxjs_1.merge)(this.absorbObjChange(serverEvents), this.absorbObjRemoval(serverEvents), 
+        this.absorbingRemoteEventsProc = (0, rxjs_1.from)(this.remoteStorage.openEventSource().then(({ client, heartbeat }) => {
+            heartbeat.subscribe({
+                next: ev => this.connectionEvents.next(toStorageConnectionStatus(ev))
+            });
+            return client;
+        }))
+            .pipe((0, operators_1.map)(client => (0, rxjs_1.merge)(this.absorbObjChange(client), this.absorbObjRemoval(client), 
         // XXX commenting out to see if unknownEvent exception goes away
         //     Is server doesn't know it?
-        // this.absorbObjVersionArchival(serverEvents),
-        this.absorbArchVersionRemoval(serverEvents))
+        // this.absorbObjVersionArchival(client),
+        this.absorbArchVersionRemoval(client))), (0, operators_1.mergeMap)(event$ => event$))
             .subscribe({
             next: noop,
             error: async (err) => {
@@ -59,8 +72,8 @@ class RemoteEvents {
             this.absorbingRemoteEventsProc = undefined;
         }
     }
-    absorbObjChange(serverEvents) {
-        return serverEvents.observe(owner_1.events.objChanged.EVENT_NAME)
+    absorbObjChange(client) {
+        return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objChanged.EVENT_NAME, obs)))
             .pipe((0, operators_1.mergeMap)(async ({ newVer, objId }) => {
             if (!Number.isInteger(newVer) || (newVer < 1)) {
                 return;
@@ -77,9 +90,9 @@ class RemoteEvents {
             });
         }, 1));
     }
-    absorbObjRemoval(serverEvents) {
-        return serverEvents.observe(owner_1.events.objRemoved.EVENT_NAME)
-            .pipe((0, operators_1.filter)((objRm) => !!objRm.objId), (0, operators_1.mergeMap)(async ({ objId }) => {
+    absorbObjRemoval(client) {
+        return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objRemoved.EVENT_NAME, obs)))
+            .pipe((0, operators_1.filter)(objRmEvent => !!objRmEvent.objId), (0, operators_1.mergeMap)(async ({ objId }) => {
             const obj = await this.files.findObj(objId);
             if (!obj) {
                 return;
@@ -91,8 +104,8 @@ class RemoteEvents {
             });
         }, 1));
     }
-    absorbObjVersionArchival(serverEvents) {
-        return serverEvents.observe(owner_1.events.objVersionArchived.EVENT_NAME)
+    absorbObjVersionArchival(client) {
+        return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objVersionArchived.EVENT_NAME, obs)))
             .pipe((0, operators_1.mergeMap)(async ({ objId, archivedVer }) => {
             const obj = await this.files.findObj(objId);
             if (!obj) {
@@ -106,8 +119,8 @@ class RemoteEvents {
             });
         }, 1));
     }
-    absorbArchVersionRemoval(serverEvents) {
-        return serverEvents.observe(owner_1.events.objArchivedVersionRemoved.EVENT_NAME)
+    absorbArchVersionRemoval(client) {
+        return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objArchivedVersionRemoved.EVENT_NAME, obs)))
             .pipe((0, operators_1.mergeMap)(async ({ objId, archivedVer }) => {
             const obj = await this.files.findObj(objId);
             if (!obj) {

package/build/lib-client/3nstorage/storage-owner.d.ts

@@ -2,9 +2,8 @@ import { NetClient } from '../request-utils';
 import * as api from '../../lib-common/service-api/3nstorage/owner';
 import { ServiceUser, IGetMailerIdSigner } from '../user-with-mid-session';
 import * as keyGen from '../key-derivation';
-import { SubscribingClient } from '../../lib-common/ipc/ws-ipc';
+import { makeSubscriber } from '../../lib-common/ipc/ws-ipc';
 import { ObjId } from '../xsp-fs/common';
-import { LogError } from '../logging/log-to-file';
 export type FirstSaveReqOpts = api.PutObjFirstQueryOpts;
 export type FollowingSaveReqOpts = api.PutObjSecondQueryOpts;
 export declare class StorageOwner extends ServiceUser {
@@ -87,5 +86,5 @@ export declare class StorageOwner extends ServiceUser {
      * @return a promise, resolvable, when an object is deleted.
      */
     deleteObj(objId: string): Promise<void>;
-    openEventSource(log: LogError): Promise<SubscribingClient>;
+    openEventSource(): Promise<ReturnType<typeof makeSubscriber>>;
 }

package/build/lib-client/3nstorage/storage-owner.js

@@ -329,10 +329,10 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
-    async openEventSource(log) {
+    async openEventSource() {
         const rep = await this.openWS(api.wsEventChannel.URL_END);
         if (rep.status === api.wsEventChannel.SC.ok) {
-            return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined, log);
+            return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');

package/build/lib-client/asmail/recipient.d.ts

@@ -1,8 +1,7 @@
 import { NetClient } from '../request-utils';
 import * as api from '../../lib-common/service-api/asmail/retrieval';
 import { ServiceUser, IGetMailerIdSigner } from '../user-with-mid-session';
-import { SubscribingClient } from '../../lib-common/ipc/ws-ipc';
-import { LogError } from '../logging/log-to-file';
+import { makeSubscriber } from '../../lib-common/ipc/ws-ipc';
 type InboxException = web3n.asmail.InboxException;
 export declare function makeMsgNotFoundException(msgId: string): InboxException;
 export declare function makeObjNotFoundException(msgId: string, objId: string): InboxException;
@@ -37,6 +36,6 @@ export declare class MailRecipient extends ServiceUser {
      */
     getObjSegs(msgId: string, objId: string, start: number, end: number): Promise<Uint8Array>;
     removeMsg(msgId: string): Promise<void>;
-    openEventSource(log: LogError): Promise<SubscribingClient>;
+    openEventSource(): Promise<ReturnType<typeof makeSubscriber>>;
 }
 export {};

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

@@ -191,10 +191,10 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
-    async openEventSource(log) {
+    async openEventSource() {
         const rep = await this.openWS(api.wsEventChannel.URL_END);
         if (rep.status === api.wsEventChannel.SC.ok) {
-            return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined, log);
+            return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');

package/build/lib-common/ipc/ws-ipc.d.ts

@@ -1,4 +1,4 @@
-import { LogError } from '../../lib-client/logging/log-to-file';
+import { Observable } from 'rxjs';
 import { SubscribingClient } from './generic-ipc';
 import * as WebSocket from 'ws';
 export { RequestEnvelope, RequestHandler, EventfulServer, makeEventfulServer, SubscribingClient } from './generic-ipc';
@@ -8,4 +8,20 @@ export interface WSException extends web3n.RuntimeException {
     socketClosed?: true;
 }
 export declare function makeWSException(params: Partial<WSException>, flags?: Partial<WSException>): WSException;
-export declare function makeSubscriber(ws: WebSocket, ipcChannel: string | undefined, log: LogError): SubscribingClient;
+export interface ConnectionStatus {
+    /**
+     * ping number is a number of millisecond between previous and current data receiving from server.
+     */
+    ping?: number;
+    /**
+     * This mirrors a "slow socket" exception, thrown to data sending process.
+     */
+    slowSocket?: true;
+    socketClosed?: true;
+    error?: any;
+}
+export declare function makeSubscriber(ws: WebSocket, ipcChannel: string | undefined): {
+    client: SubscribingClient;
+    heartbeat: Observable<ConnectionStatus>;
+};
+export declare function addToStatus<T extends ConnectionStatus>(status: ConnectionStatus, params: Partial<T>): T;

package/build/lib-common/ipc/ws-ipc.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeEventfulServer = void 0;
 exports.makeWSException = makeWSException;
 exports.makeSubscriber = makeSubscriber;
+exports.addToStatus = addToStatus;
+const rxjs_1 = require("rxjs");
 const runtime_1 = require("../exceptions/runtime");
 const generic_ipc_1 = require("./generic-ipc");
 var generic_ipc_2 = require("./generic-ipc");
@@ -32,31 +34,10 @@ const MAX_TXT_BUFFER = 64 * 1024;
  * messages.
  * @param ws
  */
-function makeJsonCommPoint(ws, log) {
+function makeJsonCommPoint(ws) {
     const observers = new generic_ipc_1.MultiObserverWrap();
-    const resetTimer = makeSignalsTimeObserver(ws.url, log);
-    ws.on('message', onTxtMessage(ws, observers, resetTimer));
-    ws.on('close', onClose(observers, resetTimer));
-    ws.on('error', onError(ws, observers, resetTimer));
-    ws.on('ping', onPing(ws, resetTimer));
-    const commPoint = {
-        subscribe: obs => observers.add(obs),
-        postMessage(env) {
-            if (ws.bufferedAmount > MAX_TXT_BUFFER) {
-                throw makeWSException({ socketSlow: true });
-            }
-            ws.send(JSON.stringify(env));
-        }
-    };
-    return commPoint;
-}
-/**
- * This generates an on-message callback for text messages in a web socket.
- * @param ws
- * @param observers
- */
-function onTxtMessage(ws, observers, resetTimer) {
-    return (data) => {
+    const { heartbeat, healthyBeat, otherBeat } = makeHeartbeat();
+    ws.on('message', data => {
         if (typeof data !== 'string') {
             return;
         }
@@ -69,83 +50,85 @@ function onTxtMessage(ws, observers, resetTimer) {
         }
         catch (err) {
             ws.close();
+            otherBeat(err, true);
             observers.error(err);
             return;
         }
         observers.next(env);
-        resetTimer();
-    };
-}
-/**
- * This generates an on-close callback for a web socket.
- * @param observers
- */
-function onClose(observers, resetTimer) {
-    return (code, reason) => {
+        healthyBeat();
+    });
+    ws.on('close', (code, reason) => {
         if (code === 1000) {
-            resetTimer(true);
+            otherBeat(undefined, true);
             observers.complete();
         }
         else {
-            resetTimer(true, { code, reason });
+            otherBeat({ error: { code, reason } }, true);
             observers.error(makeWSException({
                 socketClosed: true,
                 cause: { code, reason }
             }));
         }
-    };
-}
-/**
- * This generates an on-error callback for a web socket.
- * @param ws
- * @param observers
- */
-function onError(ws, observers, closeTimer) {
-    return (err) => {
-        closeTimer(true, err);
+    });
+    ws.on('error', (err) => {
+        otherBeat(err, true);
         observers.error(makeWSException({ cause: err }));
         ws.close();
-    };
-}
-function onPing(ws, resetTimer) {
-    return () => {
-        resetTimer();
+    });
+    ws.on('ping', () => {
         ws.pong();
+        healthyBeat();
+    });
+    const comm = {
+        subscribe: obs => observers.add(obs),
+        postMessage(env) {
+            if (ws.bufferedAmount > MAX_TXT_BUFFER) {
+                otherBeat({ slowSocket: true });
+                throw makeWSException({ socketSlow: true });
+            }
+            ws.send(JSON.stringify(env));
+        }
     };
+    return { comm, heartbeat };
 }
-function makeSignalsTimeObserver(url, log) {
-    const serverPingSettings = 2 * 60 * 1000;
-    let lastMoment = Date.now();
-    let int = undefined;
-    function resetWait(setNew = true) {
-        lastMoment = Date.now();
-        if (int) {
-            clearInterval(int);
-            int = undefined;
-        }
-        if (setNew) {
-            int = setInterval(() => {
-                log(`Ping/data from ${url} is not observed in last ${Math.floor((Date.now() - lastMoment) / 1000)} seconds`);
-            }, serverPingSettings * 1.5).unref();
-        }
+function makeHeartbeat() {
+    const status = new rxjs_1.Subject();
+    let lastInfo = Date.now();
+    function healthyBeat() {
+        const now = Date.now();
+        status.next({
+            ping: now - lastInfo
+        });
+        lastInfo = now;
     }
-    return (done, err) => {
-        if (done) {
-            if (err) {
-                log(err, `WebSocket to ${url} closed with error`);
-            }
-            else {
-                log(null, `WebSocket to ${url} closed`);
-            }
-            resetWait(false);
+    function otherBeat(beat, end = false) {
+        if (beat) {
+            status.next(beat);
         }
-        else {
-            resetWait();
+        if (end) {
+            status.next({
+                socketClosed: true
+            });
+            status.complete();
         }
+    }
+    return {
+        heartbeat: status.asObservable().pipe((0, rxjs_1.share)()),
+        healthyBeat,
+        otherBeat
+    };
+}
+function makeSubscriber(ws, ipcChannel) {
+    const { comm, heartbeat } = makeJsonCommPoint(ws);
+    return {
+        client: (0, generic_ipc_1.makeSubscribingClient)(ipcChannel, comm),
+        heartbeat
     };
 }
-function makeSubscriber(ws, ipcChannel, log) {
-    const comm = makeJsonCommPoint(ws, log);
-    return (0, generic_ipc_1.makeSubscribingClient)(ipcChannel, comm);
+function addToStatus(status, params) {
+    for (const [field, value] of Object.values(params)) {
+        status[field] = value;
+    }
+    return status;
 }
 Object.freeze(exports);

package/build/lib-index.d.ts

@@ -11,3 +11,4 @@ export { appDirs } from './core/app-files';
 export { sysFolders } from "./core/storage/system-folders";
 export { DeviceFS } from './lib-client/local-files/device-fs';
 export { makeLogger } from './lib-client/logging/log-to-file';
+export declare const SYSTEM_DOMAIN = "3nweb.computer";

package/build/lib-index.js

@@ -30,7 +30,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeLogger = exports.DeviceFS = exports.sysFolders = exports.appDirs = exports.makeNetClient = exports.makeServiceLocator = exports.ASMail = exports.SignIn = exports.reverseDomain = exports.Storages = exports.IdManager = exports.SignUp = void 0;
+exports.SYSTEM_DOMAIN = exports.makeLogger = exports.DeviceFS = exports.sysFolders = exports.appDirs = exports.makeNetClient = exports.makeServiceLocator = exports.ASMail = exports.SignIn = exports.reverseDomain = exports.Storages = exports.IdManager = exports.SignUp = void 0;
 __exportStar(require("./core"), exports);
 var sign_up_1 = require("./core/startup/sign-up");
 Object.defineProperty(exports, "SignUp", { enumerable: true, get: function () { return sign_up_1.SignUp; } });
@@ -55,4 +55,5 @@ var device_fs_1 = require("./lib-client/local-files/device-fs");
 Object.defineProperty(exports, "DeviceFS", { enumerable: true, get: function () { return device_fs_1.DeviceFS; } });
 var log_to_file_1 = require("./lib-client/logging/log-to-file");
 Object.defineProperty(exports, "makeLogger", { enumerable: true, get: function () { return log_to_file_1.makeLogger; } });
+exports.SYSTEM_DOMAIN = '3nweb.computer';
 Object.freeze(exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.42.3",
+  "version": "0.42.5",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",

package/build/lib-client/server-events.d.ts

@@ -1,14 +0,0 @@
-import { SubscribingClient } from '../lib-common/ipc/generic-ipc';
-import { Observable } from 'rxjs';
-export declare class ServerEvents<N extends string, T> {
-    private readonly subscribeToServer;
-    private server;
-    private openningServer;
-    constructor(subscribeToServer: () => Promise<SubscribingClient>);
-    /**
-     * This method creates an observable of server's events.
-     * @param event is an event on server, to which to subscribe.
-     */
-    observe(event: N): Observable<T>;
-    private setServer;
-}

package/build/lib-client/server-events.js

@@ -1,82 +0,0 @@
-"use strict";
-/*
- Copyright (C) 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
- Foundation, either version 3 of the License, or (at your option) any later
- version.
- 
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 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/>.
-*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerEvents = void 0;
-const rxjs_1 = require("rxjs");
-const synced_1 = require("../lib-common/processes/synced");
-class ServerEvents {
-    constructor(subscribeToServer) {
-        this.subscribeToServer = subscribeToServer;
-        this.server = undefined;
-        this.openningServer = new synced_1.SingleProc();
-        Object.seal(this);
-    }
-    /**
-     * This method creates an observable of server's events.
-     * @param event is an event on server, to which to subscribe.
-     */
-    observe(event) {
-        return new rxjs_1.Observable(observer => {
-            // simple sync creation of detach function
-            if (this.server) {
-                return this.server.subscribe(event, observer);
-            }
-            // detach function that works around of async creation of event source
-            let detach;
-            let obs = observer;
-            // open server, ensuring only one process running
-            if (!this.openningServer.isProcessing()) {
-                this.openningServer.addStarted(this.subscribeToServer());
-            }
-            this.openningServer.latestTaskAtThisMoment()
-                .then((server) => {
-                this.setServer(server);
-                if (!obs) {
-                    return;
-                }
-                detach = this.server.subscribe(event, obs);
-                obs = undefined;
-            })
-                .catch(err => {
-                obs === null || obs === void 0 ? void 0 : obs.error(err);
-                obs = undefined;
-            });
-            return () => {
-                if (detach) {
-                    detach();
-                    detach = undefined;
-                }
-                else {
-                    obs = undefined;
-                }
-            };
-        });
-    }
-    setServer(server) {
-        this.server = server;
-        this.server.on('end', () => {
-            if (this.server === server) {
-                this.server = undefined;
-            }
-        });
-    }
-}
-exports.ServerEvents = ServerEvents;
-Object.freeze(ServerEvents.prototype);
-Object.freeze(ServerEvents);
-Object.freeze(exports);

package/test-data-1-1759691784470/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:16:42 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:42 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-10-1759691821007/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:17:04 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:04 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-11-1759691821008/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:17:04 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:04 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-12-1759691824688/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:17:07 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:07 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-13-1759691825525/util/logs/2025-10-05.log.txt

@@ -1,28 +0,0 @@
-
-Sun Oct 05 2025 15:17:07 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:07 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:07 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:07 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-2-1759691784473/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:16:44 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:44 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-3-1759691789049/util/logs/2025-10-05.log.txt

@@ -1,28 +0,0 @@
-
-Sun Oct 05 2025 15:16:34 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:34 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:34 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:34 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-4-1759691794994/util/logs/2025-10-05.log.txt

@@ -1,28 +0,0 @@
-
-Sun Oct 05 2025 15:16:40 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:40 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:40 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:40 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-5-1759691804247/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:16:46 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:46 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-6-1759691806167/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:16:48 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:48 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-7-1759691808152/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:16:56 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:16:56 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-8-1759691816773/util/logs/2025-10-05.log.txt

@@ -1,14 +0,0 @@
-
-Sun Oct 05 2025 15:17:00 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:00 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined

package/test-data-9-1759691817611/util/logs/2025-10-05.log.txt

@@ -1,28 +0,0 @@
-
-Sun Oct 05 2025 15:17:00 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:00 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/asmail/retrieval/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:00 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined
-
-Sun Oct 05 2025 15:17:00 GMT-0400 (Eastern Daylight Saving Time) ==================================
-Core version 0.42.3
-Log level: error.
-WebSocket to wss://localhost:8088/3nstorage/owner/events closed with error
-
-Error message: undefined