core-3nweb-client-lib 0.44.0 → 0.44.2

package/build/lib-client/ws-utils.js

@@ -46,21 +46,16 @@ function openSocket(url, sessionId) {
     ws.on('error', initOnError);
     ws.on('unexpected-response', onNonOkReply);
     ws.once('open', () => {
-        const okReply = {
+        opening === null || opening === void 0 ? void 0 : opening.resolve({
             url,
             method: 'GET',
             status: 200,
             data: ws
-        };
-        opening === null || opening === void 0 ? void 0 : opening.resolve(okReply);
+        });
         opening = undefined;
         ws.removeListener('error', initOnError);
         ws.removeListener('unexpected-response', onNonOkReply);
     });
-    ws.on('error', err => {
-        // XXX we need 
-        console.error(`Error in ${ws.url} connection`, err);
-    });
     return opening.promise;
 }
 Object.freeze(exports);

package/build/lib-client/xsp-fs/common.d.ts

@@ -2,6 +2,7 @@ import type { ScryptGenParams } from '../key-derivation';
 import type { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import type { Observable } from 'rxjs';
 import type { LogError } from '../logging/log-to-file';
+import { StorageConnectionStatus } from '../../core/storage/synced/remote-events';
 export type { AsyncSBoxCryptor } from 'xsp-files';
 export type { FolderInJSON } from './folder-node';
 type StorageType = web3n.files.FSType;
@@ -119,6 +120,7 @@ export interface SyncedStorage extends Storage {
     getNumOfBytesNeedingDownload(objId: ObjId, version: number): Promise<number | 'unknown'>;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
+    connectionEvent$: Observable<StorageConnectionStatus>;
 }
 export interface SyncedObjStatus extends LocalObjStatus {
     syncStatus(): SyncStatus;

package/build/lib-client/xsp-fs/common.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2019 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2019 - 2020, 2022, 2025 - 2026 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
@@ -126,6 +126,7 @@ function wrapSyncStorageImplementation(impl) {
     wrap.suspendNetworkActivity = impl.suspendNetworkActivity.bind(impl);
     wrap.resumeNetworkActivity = impl.resumeNetworkActivity.bind(impl);
     wrap.getNumOfBytesNeedingDownload = impl.getNumOfBytesNeedingDownload.bind(impl);
+    wrap.connectionEvent$ = impl.connectionEvent$;
     return Object.freeze(wrap);
 }
 function isSyncedStorage(storage) {

package/build/lib-client/xsp-fs/folder-node.js

@@ -1096,13 +1096,11 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             const nodes = state.nodes;
             const remoteNodes = remote.folderInfo.nodes;
             const events = [];
-            if (removed) {
-                for (const { name, removedIn } of removed) {
-                    if (removedIn === 'r') {
-                        const node = nodes[name];
-                        delete nodes[name];
-                        events.push(this.makeEntryRemovalEvent(newVersion, 'sync', node));
-                    }
+            if (removed === null || removed === void 0 ? void 0 : removed.inRemote) {
+                for (const name of removed.inRemote) {
+                    const node = nodes[name];
+                    delete nodes[name];
+                    events.push(this.makeEntryRemovalEvent(newVersion, 'sync', node));
                 }
             }
             if (renamed) {
@@ -1122,19 +1120,17 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                     }
                 }
             }
-            if (added) {
-                for (const { name, addedIn } of added) {
-                    if (addedIn === 'r') {
-                        const node = remoteNodes[name];
-                        (0, assert_1.assert)(!!node);
-                        if (nameOverlaps === null || nameOverlaps === void 0 ? void 0 : nameOverlaps.includes(name)) {
-                            while (nodes[node.name]) {
-                                node.name = `${node.name}${opts === null || opts === void 0 ? void 0 : opts.postfixForNameOverlaps}`;
-                            }
+            if (added === null || added === void 0 ? void 0 : added.inRemote) {
+                for (const name of added.inRemote) {
+                    const node = remoteNodes[name];
+                    (0, assert_1.assert)(!!node);
+                    if (nameOverlaps === null || nameOverlaps === void 0 ? void 0 : nameOverlaps.includes(name)) {
+                        while (nodes[node.name]) {
+                            node.name = `${node.name}${opts === null || opts === void 0 ? void 0 : opts.postfixForNameOverlaps}`;
                         }
-                        nodes[node.name] = node;
-                        events.push(this.makeEntryAdditionEvent(newVersion, 'sync', node));
                     }
+                    nodes[node.name] = node;
+                    events.push(this.makeEntryAdditionEvent(newVersion, 'sync', node));
                 }
             }
             return events;
@@ -1188,9 +1184,9 @@ function addToTransitionState(state, f, key) {
 function diffNodes(current, remote, synced) {
     const currentNodesById = orderByIds(current.nodes);
     const syncedNodesById = orderByIds(synced.nodes);
-    const removed = [];
+    const removed = { inLocal: [], inRemote: [] };
     const renamed = [];
-    const added = [];
+    const added = { inLocal: [], inRemote: [] };
     const rekeyed = [];
     const nameOverlaps = [];
     for (const remoteNode of Object.values(remote.nodes)) {
@@ -1229,10 +1225,10 @@ function diffNodes(current, remote, synced) {
         else {
             const syncedNode = syncedNodesById.get(remoteNode.objId);
             if (syncedNode) {
-                removed.push({ name: remoteNode.name, removedIn: 'l' });
+                removed.inLocal.push(remoteNode.name);
             }
             else {
-                added.push({ name: remoteNode.name, addedIn: 'r' });
+                added.inRemote.push(remoteNode.name);
             }
             if (current.nodes[remoteNode.name]) {
                 nameOverlaps.push(remoteNode.name);
@@ -1242,13 +1238,13 @@ function diffNodes(current, remote, synced) {
     for (const localNode of currentNodesById.values()) {
         const syncedNode = syncedNodesById.get(localNode.objId);
         if (!syncedNode) {
-            added.push({ name: localNode.name, addedIn: 'l' });
+            added.inLocal.push(localNode.name);
         }
     }
     return {
-        removed: ((removed.length > 0) ? removed : undefined),
+        removed: reduceEmptyIn(removed),
         renamed: ((renamed.length > 0) ? renamed : undefined),
-        added: ((added.length > 0) ? added : undefined),
+        added: reduceEmptyIn(added),
         rekeyed: ((rekeyed.length > 0) ? rekeyed : undefined),
         nameOverlaps: ((nameOverlaps.length > 0) ? nameOverlaps : undefined),
     };
@@ -1291,4 +1287,22 @@ function identifyChanges(originalNodes, newNodes) {
     }
     return { addedNodes, removedNodes, renamedNodes };
 }
+function reduceEmptyIn(c) {
+    if (c.inLocal.length > 0) {
+        if (c.inRemote.length > 0) {
+            return c;
+        }
+        else {
+            return { inLocal: c.inLocal };
+        }
+    }
+    else {
+        if (c.inRemote.length > 0) {
+            return { inRemote: c.inRemote };
+        }
+        else {
+            return;
+        }
+    }
+}
 Object.freeze(exports);

package/build/lib-client/xsp-fs/fs.js

@@ -859,24 +859,9 @@ class S {
             throw (0, file_1.makeFileException)('notDirectory', `${path}/${remoteItemName}`);
         }
     }
-    // async adoptAllRemoteItems(
-    // 	path: string, opts?: OptionsToAdoptAllRemoteItems
-    // ): Promise<number|undefined> {
-    // 	const folderNode = await this.getFolderNode(path);
-    // 	return await folderNode.adoptItemsFromRemoteVersion(opts);
-    // }
     async mergeFolderCurrentAndRemoteVersions(path, opts) {
         const folderNode = await this.getFolderNode(path);
-        const newLocalVersion = await folderNode.mergeCurrentAndRemoteVersions(opts);
-        if (newLocalVersion && (newLocalVersion < 0)) {
-            const { folderPath } = split(path);
-            if (folderPath.length > 0) {
-                const parent = await this.n.get(folderPath.join('/'));
-                // XXX removing folder in parent -- what happens with children?
-                await parent.removeChild(folderNode);
-            }
-        }
-        return newLocalVersion;
+        return await folderNode.mergeCurrentAndRemoteVersions(opts);
     }
 }
 Object.freeze(S.prototype);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017, 2025 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 2025 - 2026 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
@@ -504,6 +504,7 @@ class EventsReceivingSide extends RequestingSide {
      * @param err
      */
     completeEvent(ipcChannel, err) {
+        var _a, _b, _c, _d;
         const listeners = this.listeners.get(ipcChannel);
         if (!listeners) {
             return;
@@ -512,14 +513,10 @@ class EventsReceivingSide extends RequestingSide {
         for (const listener of listeners) {
             try {
                 if (err === undefined) {
-                    if (listener.observer.complete) {
-                        listener.observer.complete();
-                    }
+                    (_b = (_a = listener.observer).complete) === null || _b === void 0 ? void 0 : _b.call(_a);
                 }
                 else {
-                    if (listener.observer.error) {
-                        listener.observer.error(err);
-                    }
+                    (_d = (_c = listener.observer).error) === null || _d === void 0 ? void 0 : _d.call(_c, err);
                 }
             }
             catch (err2) {
@@ -528,7 +525,24 @@ class EventsReceivingSide extends RequestingSide {
         }
     }
     handleCompletion(err) {
+        var _a, _b, _c, _d, _e;
         super.handleCompletion(err);
+        for (const ipcChannel of this.listeners.keys()) {
+            const listeners = (_a = this.listeners.get(ipcChannel)) !== null && _a !== void 0 ? _a : [];
+            for (const listener of listeners) {
+                try {
+                    if (err === undefined) {
+                        (_c = (_b = listener.observer).complete) === null || _c === void 0 ? void 0 : _c.call(_b);
+                    }
+                    else {
+                        (_e = (_d = listener.observer).error) === null || _e === void 0 ? void 0 : _e.call(_d, err);
+                    }
+                }
+                catch (err2) {
+                    console.error(err2);
+                }
+            }
+        }
         this.listeners.clear();
     }
     subscribe(channel, observer) {
@@ -635,37 +649,31 @@ class MultiObserverWrap {
         return () => { this.obs.delete(obs); };
     }
     next(o) {
+        var _a;
         if (this.isDone) {
             return;
         }
         for (const obs of this.obs) {
-            if (!obs.next) {
-                continue;
-            }
-            obs.next(o);
+            (_a = obs.next) === null || _a === void 0 ? void 0 : _a.call(obs, o);
         }
     }
     error(err) {
+        var _a;
         if (this.isDone) {
             return;
         }
         for (const obs of this.obs) {
-            if (!obs.error) {
-                continue;
-            }
-            obs.error(err);
+            (_a = obs.error) === null || _a === void 0 ? void 0 : _a.call(obs, err);
         }
         this.setDone();
     }
     complete() {
+        var _a;
         if (this.isDone) {
             return;
         }
         for (const obs of this.obs) {
-            if (!obs.complete) {
-                continue;
-            }
-            obs.complete();
+            (_a = obs.complete) === null || _a === void 0 ? void 0 : _a.call(obs);
         }
         this.setDone();
     }
@@ -697,29 +705,26 @@ class SingleObserverWrap {
         this.obs = obs;
     }
     next(o) {
+        var _a, _b;
         if (this.isDone || !this.obs) {
             return;
         }
-        if (this.obs.next) {
-            this.obs.next(o);
-        }
+        (_b = (_a = this.obs) === null || _a === void 0 ? void 0 : _a.next) === null || _b === void 0 ? void 0 : _b.call(_a, o);
     }
     error(err) {
+        var _a, _b;
         if (this.isDone) {
             return;
         }
-        if (this.obs && this.obs.error) {
-            this.obs.error(err);
-        }
+        (_b = (_a = this.obs) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.call(_a, err);
         this.setDone();
     }
     complete() {
+        var _a, _b;
         if (this.isDone) {
             return;
         }
-        if (this.obs && this.obs.complete) {
-            this.obs.complete();
-        }
+        (_b = (_a = this.obs) === null || _a === void 0 ? void 0 : _a.complete) === null || _b === void 0 ? void 0 : _b.call(_a);
         this.setDone();
     }
     setDone() {

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

@@ -10,6 +10,7 @@ export interface WSException extends web3n.RuntimeException {
 }
 export declare function makeWSException(params: Partial<WSException>, flags?: Partial<WSException>): WSException;
 export interface ConnectionStatus {
+    type: 'heartbeat' | 'heartbeat-skip' | 'disconnected' | 'connected';
     url: string;
     /**
      * ping number is a number of millisecond between previous and current data receiving from server.
@@ -19,6 +20,7 @@ export interface ConnectionStatus {
      * This mirrors a "slow socket" exception, thrown to data sending process.
      */
     slowSocket?: true;
+    missingPongsFromServer?: number;
     socketClosed?: true;
     error?: any;
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2025 3NSoft Inc.
+ Copyright (C) 2017, 2025 - 2026 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,7 +13,8 @@
  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.WebSocketListening = exports.makeEventfulServer = void 0;
 exports.makeWSException = makeWSException;
@@ -30,6 +31,7 @@ function makeWSException(params, flags) {
     return (0, runtime_1.makeRuntimeException)('websocket', params, flags !== null && flags !== void 0 ? flags : {});
 }
 const MAX_TXT_BUFFER = 64 * 1024;
+const CLIENT_SIDE_PING_PERIOD = 10 * 1000;
 /**
  * This creates a json communication point on a given web socket.
  * Point may have many listeners, allowing for single parsing of incoming
@@ -39,6 +41,21 @@ const MAX_TXT_BUFFER = 64 * 1024;
 function makeJsonCommPoint(ws) {
     const observers = new generic_ipc_1.MultiObserverWrap();
     const { heartbeat, healthyBeat, otherBeat } = makeHeartbeat(ws.url);
+    let outstandingPongs = 0;
+    let closedByPingProc = false;
+    const pingRepeat = setInterval(() => {
+        if (outstandingPongs >= 2) {
+            ws.close();
+            closedByPingProc = true;
+            clearInterval(pingRepeat);
+            return;
+        }
+        if (outstandingPongs > 0) {
+            otherBeat('heartbeat-skip', { missingPongsFromServer: outstandingPongs });
+        }
+        ws.ping();
+        outstandingPongs += 1;
+    }, CLIENT_SIDE_PING_PERIOD);
     ws.on('message', data => {
         if (observers.done) {
             return;
@@ -49,7 +66,8 @@ function makeJsonCommPoint(ws) {
         }
         catch (err) {
             ws.close();
-            otherBeat(err, true);
+            clearInterval(pingRepeat);
+            otherBeat('disconnected', err, true);
             observers.error(err);
             return;
         }
@@ -57,12 +75,13 @@ function makeJsonCommPoint(ws) {
         healthyBeat();
     });
     ws.on('close', (code, reason) => {
+        clearInterval(pingRepeat);
         if (code === 1000) {
-            otherBeat({ socketClosed: true }, true);
+            otherBeat('disconnected', { socketClosed: true }, true);
             observers.complete();
         }
         else {
-            otherBeat({ error: { code, reason } }, true);
+            otherBeat('disconnected', { error: { code, reason } }, true);
             observers.error(makeWSException({
                 socketClosed: true,
                 cause: { code, reason }
@@ -70,24 +89,30 @@ function makeJsonCommPoint(ws) {
         }
     });
     ws.on('error', (err) => {
-        otherBeat(err, true);
+        otherBeat('disconnected', err, true);
         observers.error(makeWSException({ cause: err }));
+        clearInterval(pingRepeat);
         ws.close();
     });
     ws.on('ping', () => {
         ws.pong();
         healthyBeat();
     });
+    ws.on('pong', () => {
+        healthyBeat();
+        outstandingPongs = 0;
+    });
     const comm = {
         subscribe: obs => observers.add(obs),
         postMessage(env) {
             if (ws.bufferedAmount > MAX_TXT_BUFFER) {
-                otherBeat({ slowSocket: true });
+                otherBeat('heartbeat', { slowSocket: true });
                 throw makeWSException({ socketSlow: true });
             }
             ws.send(JSON.stringify(env));
         }
     };
+    otherBeat('connected', {});
     return { comm, heartbeat };
 }
 function makeHeartbeat(url) {
@@ -96,13 +121,15 @@ function makeHeartbeat(url) {
     function healthyBeat() {
         const now = Date.now();
         status.next({
+            type: 'heartbeat',
             url,
             ping: now - lastInfo
         });
         lastInfo = now;
     }
-    function otherBeat(params, end = false) {
+    function otherBeat(type, params, end = false) {
         status.next({
+            type,
             url,
             ...params
         });

package/build/lib-common/map-of-sets.d.ts

@@ -6,4 +6,5 @@ export declare class MapOfSets<TKey, TValue> {
     remove(key: TKey, value: TValue): void;
     removeAll(key: TKey): void;
     clear(): void;
+    keys(): MapIterator<TKey>;
 }

package/build/lib-common/map-of-sets.js

@@ -48,6 +48,9 @@ class MapOfSets {
     clear() {
         this.map.clear();
     }
+    keys() {
+        return this.map.keys();
+    }
 }
 exports.MapOfSets = MapOfSets;
 Object.freeze(MapOfSets.prototype);