core-3nweb-client-lib 0.43.4 → 0.43.6

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

@@ -383,10 +383,10 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         const attrs = this.attrs.copy();
         // do action within transition state
         const changeEvents = await change(state, version);
-        // save transition state
+        // save new state
         const encSub = await this.crypto.write(state, version, attrs, this.xattrs);
         await this.storage.saveObj(this.objId, version, encSub);
-        // complete transition
+        // apply new state to in-memory object
         this.currentState = state;
         this.setCurrentVersion(version);
         this.attrs = attrs;
@@ -681,7 +681,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
     }
     async removeFolderObj(src, passIdsForRmUpload = false) {
         const childrenNodes = await this.doChange(true, async () => {
-            if (this.version < 0) {
+            if (this.isMarkedRemoved) {
                 return;
             }
             const childrenNodes = await this.getAllNodes();
@@ -692,12 +692,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             return;
         }
         if (this.isInSyncedStorage) {
-            if (passIdsForRmUpload) {
-                return this.removeChildrenObjsInSyncedStorage(childrenNodes, src, true);
-            }
-            else {
-                this.removeChildrenObjsInSyncedStorage(childrenNodes, src, false);
-            }
+            return await this.removeChildrenObjsInSyncedStorage(childrenNodes, src, passIdsForRmUpload);
         }
         else {
             this.callRemoveObjOnAll(src, childrenNodes);
@@ -709,7 +704,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         }
     }
     async removeChildrenObjsInSyncedStorage(childrenNodes, src, passIdsForRmUpload) {
-        if (this.version < 0) {
+        if (this.isMarkedRemoved) {
             return;
         }
         let uploadRmsHere;

package/build/lib-client/xsp-fs/node-in-fs.d.ts

@@ -23,6 +23,8 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
     private writeProc;
     get version(): number;
     protected setCurrentVersion(newVersion: number): void;
+    private markRemoved;
+    protected get isMarkedRemoved(): boolean;
     readonly isInSyncedStorage: boolean;
     protected constructor(storage: Storage, type: NodeType, name: string, objId: string, currentVersion: number, parentId: string | undefined);
     protected getObjSrcOfVersion(flags: VersionedReadFlags | undefined): Promise<ObjSource>;

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

@@ -37,11 +37,17 @@ class NodeInFS {
         return this.currentVersion;
     }
     setCurrentVersion(newVersion) {
-        if (!Number.isInteger(newVersion)) {
-            throw new TypeError(`Version parameter must be an integer, but ${newVersion} is given`);
+        if (!Number.isInteger(newVersion) || (newVersion < 0)) {
+            throw new TypeError(`Version parameter must be a non-negative integer, but ${newVersion} is given`);
         }
         this.currentVersion = newVersion;
     }
+    markRemoved() {
+        this.currentVersion = -1;
+    }
+    get isMarkedRemoved() {
+        return (this.currentVersion < 0);
+    }
     constructor(storage, type, name, objId, currentVersion, parentId) {
         this.storage = storage;
         this.type = type;
@@ -184,12 +190,12 @@ class NodeInFS {
         return this.doChange(true, () => this.removeThisFromStorageNodes(src));
     }
     async removeThisFromStorageNodes(src) {
-        if (this.currentVersion < 0) {
+        if (this.isMarkedRemoved) {
             return;
         }
         await this.storage.removeObj(this.objId);
         this.storage.nodes.delete(this);
-        this.currentVersion = -1;
+        this.markRemoved();
         const event = {
             type: 'removed',
             path: this.name,
@@ -217,7 +223,7 @@ class NodeInFS {
             throw (0, runtime_1.makeRuntimeException)('file', { path: this.name, fsEtityType: this.type }, { concurrentUpdate: true });
         }
         const res = await this.writeProc.startOrChain(async () => {
-            if (this.currentVersion < 0) {
+            if (this.isMarkedRemoved) {
                 throw (0, runtime_1.makeRuntimeException)('file', {
                     path: this.name, fsEtityType: this.type,
                     message: `NodeInFS is marked removed`

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

@@ -1,6 +1,7 @@
 import { Observable } from 'rxjs';
 import { SubscribingClient } from './generic-ipc';
 import * as WebSocket from 'ws';
+import type { ConnectException, HTTPException } from '../exceptions/http';
 export { RequestEnvelope, RequestHandler, EventfulServer, makeEventfulServer, SubscribingClient } from './generic-ipc';
 export interface WSException extends web3n.RuntimeException {
     type: 'websocket';
@@ -26,3 +27,14 @@ export declare function makeSubscriber(ws: WebSocket, ipcChannel: string | undef
     heartbeat: Observable<ConnectionStatus>;
 };
 export declare function addToStatus<T extends ConnectionStatus>(status: ConnectionStatus, params: Partial<T>): T;
+export declare function shouldRestartWSAfterErr(exc: WSException | ConnectException | HTTPException): boolean;
+export declare class WebSocketListening {
+    readonly restartWaitSecs: number;
+    private readonly startWSProc;
+    private listeningProc;
+    constructor(restartWaitSecs: number, startWSProc: () => Observable<unknown>);
+    startListening(): void;
+    private sleepAndRestart;
+    close(): void;
+    get isListening(): boolean;
+}

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

@@ -15,13 +15,15 @@
  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.makeEventfulServer = void 0;
+exports.WebSocketListening = exports.makeEventfulServer = void 0;
 exports.makeWSException = makeWSException;
 exports.makeSubscriber = makeSubscriber;
 exports.addToStatus = addToStatus;
+exports.shouldRestartWSAfterErr = shouldRestartWSAfterErr;
 const rxjs_1 = require("rxjs");
 const runtime_1 = require("../exceptions/runtime");
 const generic_ipc_1 = require("./generic-ipc");
+const sleep_1 = require("../processes/sleep");
 var generic_ipc_2 = require("./generic-ipc");
 Object.defineProperty(exports, "makeEventfulServer", { enumerable: true, get: function () { return generic_ipc_2.makeEventfulServer; } });
 function makeWSException(params, flags) {
@@ -127,4 +129,67 @@ function addToStatus(status, params) {
     }
     return status;
 }
+function shouldRestartWSAfterErr(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;
+    }
+}
+class WebSocketListening {
+    constructor(restartWaitSecs, startWSProc) {
+        this.restartWaitSecs = restartWaitSecs;
+        this.startWSProc = startWSProc;
+        this.listeningProc = undefined;
+        Object.seal(this);
+    }
+    startListening() {
+        if (this.listeningProc) {
+            return;
+        }
+        const clearListeningProc = () => {
+            if (this.listeningProc === sub) {
+                this.listeningProc = undefined;
+            }
+        };
+        const sub = this.startWSProc()
+            .subscribe({
+            complete: () => {
+                clearListeningProc();
+            },
+            error: async (exc) => {
+                clearListeningProc();
+                if (shouldRestartWSAfterErr(exc)) {
+                    this.sleepAndRestart();
+                }
+            }
+        });
+        this.listeningProc = sub;
+    }
+    async sleepAndRestart() {
+        await (0, sleep_1.sleep)(this.restartWaitSecs * 1000);
+        this.startListening();
+    }
+    close() {
+        var _a;
+        (_a = this.listeningProc) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        this.listeningProc = undefined;
+    }
+    get isListening() {
+        return !!this.listeningProc;
+    }
+}
+exports.WebSocketListening = WebSocketListening;
+Object.freeze(WebSocketListening.prototype);
+Object.freeze(WebSocketListening);
 Object.freeze(exports);

package/package.json

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