core-3nweb-client-lib 0.43.3 → 0.43.5

package/build/api-defs/files.d.ts

@@ -603,16 +603,19 @@ declare namespace web3n.files {
 
 		/**
 		 * Adopts remote version.
-		 * @param opts options let one to pass exact remote version, to trigger download.
+		 * In conflicting state remote version must be present in options.
+		 * @param opts options let one to pass exact remote version.
 		 */
 		adoptRemote(opts?: OptionsToAdopteRemote): Promise<void>;
 
 	}
 
 	interface OptionsToAdopteRemote {
-		dropLocalVer?: boolean;
+		/**
+		 * Identifies remote version that should be adopted.
+		 * In conflicting state this must be present.
+		 */
 		remoteVersion?: number;
-		download?: boolean;
 	}
 
 	interface WritableFileSyncAPI extends ReadonlyFileSyncAPI {
@@ -1228,9 +1231,10 @@ declare namespace web3n.files {
 		download(path: string, version: number): Promise<void>;
 
 		/**
-		 * Adopts remote version of fs object at given path
+		 * Adopts remote version of fs object at given path.
+		 * In conflicting state remote version must be present in options.
 		 * @param path 
-		 * @param opts options let one to pass exact remote version, to trigger download.
+		 * @param opts options let one to pass exact remote version.
 		 */
 		adoptRemote(path: string, opts?: OptionsToAdopteRemote): Promise<void>;
 

package/build/core/storage/synced/obj-status.d.ts

@@ -124,7 +124,7 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     syncStatus(): SyncStatus;
     neverUploaded(): boolean;
     versionBeforeUnsyncedRemoval(): number | undefined;
-    adoptRemoteVersion(version?: number, dropLocalVer?: boolean): Promise<void>;
+    adoptRemoteVersion(version?: number): Promise<void>;
     isAmongRemote(version: number): boolean;
 }
 export declare function readAndCheckStatus(objFolder: string, objId: ObjId): Promise<ObjStatusInfo>;

package/build/core/storage/synced/obj-status.js

@@ -510,14 +510,14 @@ class ObjStatus {
             return this.status.upload.localVersion;
         }
     }
-    async adoptRemoteVersion(version, dropLocalVer = false) {
+    async adoptRemoteVersion(version) {
         var _a;
         const { local, remote } = this.status;
         if (this.stateIndicator !== 'behind') {
             if (this.stateIndicator === 'synced') {
                 return;
             }
-            else if (!dropLocalVer) {
+            else if ((this.stateIndicator === 'conflicting') && !version) {
                 throw (0, exceptions_1.makeFSSyncException)('', {
                     localVersion: local === null || local === void 0 ? void 0 : local.current,
                     remoteVersion: remote.current,

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

@@ -92,11 +92,7 @@ class SyncedStore {
     async adoptRemote(objId, opts) {
         const obj = await this.getObjOrThrow(objId);
         const objStatus = obj.statusObj();
-        await objStatus.adoptRemoteVersion(opts === null || opts === void 0 ? void 0 : opts.remoteVersion, opts === null || opts === void 0 ? void 0 : opts.dropLocalVer);
-        if (opts && opts.download) {
-            // XXX this needs implementation
-            throw new Error('SyncedStore.adoptRemote() with download option needs implementation, probably using SyncedStore.download().');
-        }
+        await objStatus.adoptRemoteVersion(opts === null || opts === void 0 ? void 0 : opts.remoteVersion);
         this.files.scheduleGC(obj);
         return objStatus.syncStatus().synced.latest;
     }

package/build/core-ipc/file.js

@@ -1199,7 +1199,7 @@ function remoteAdoptionOptsToMsg(opts) {
         return;
     }
     return {
-        dropLocalVer: (0, protobuf_msg_1.toOptVal)(opts.dropLocalVer),
+        // dropLocalVer: toOptVal(opts.dropLocalVer),
         remoteVersion: (0, protobuf_msg_1.toOptVal)(opts.remoteVersion)
     };
 }
@@ -1208,7 +1208,7 @@ function remoteAdoptionOptsFromMsg(msg) {
         return;
     }
     return {
-        dropLocalVer: (0, protobuf_msg_1.valOfOpt)(msg.dropLocalVer),
+        // dropLocalVer: valOfOpt(msg.dropLocalVer),
         remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion)
     };
 }

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

@@ -28,8 +28,11 @@ function openSocket(url, sessionId) {
     const headers = {};
     headers[request_utils_1.SESSION_ID_HEADER] = sessionId;
     const ws = new WebSocket(url, { headers, agent: https_1.globalAgent });
-    const opening = (0, deferred_1.defer)();
-    const initOnError = (err) => opening.reject((0, http_1.makeConnectionException)(url, undefined, `Cannot open websocket connection due to error: ${err.message}`));
+    let opening = (0, deferred_1.defer)();
+    const initOnError = (err) => {
+        opening === null || opening === void 0 ? void 0 : opening.reject((0, http_1.makeConnectionException)(url, undefined, `WebSocket connection error: ${err.message}`));
+        opening = undefined;
+    };
     const onNonOkReply = (req, res) => {
         const errReply = {
             url,
@@ -37,7 +40,8 @@ function openSocket(url, sessionId) {
             status: res.statusCode,
             data: undefined
         };
-        opening.resolve(errReply);
+        opening === null || opening === void 0 ? void 0 : opening.resolve(errReply);
+        opening = undefined;
     };
     ws.on('error', initOnError);
     ws.on('unexpected-response', onNonOkReply);
@@ -48,10 +52,15 @@ function openSocket(url, sessionId) {
             status: 200,
             data: ws
         };
-        opening.resolve(okReply);
+        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/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.js

@@ -38,15 +38,12 @@ function makeJsonCommPoint(ws) {
     const observers = new generic_ipc_1.MultiObserverWrap();
     const { heartbeat, healthyBeat, otherBeat } = makeHeartbeat(ws.url);
     ws.on('message', data => {
-        if (typeof data !== 'string') {
-            return;
-        }
         if (observers.done) {
             return;
         }
         let env;
         try {
-            env = JSON.parse(data);
+            env = JSON.parse(data.toString('utf8'));
         }
         catch (err) {
             ws.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.43.3",
+  "version": "0.43.5",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -32,13 +32,13 @@
     "protobufjs": "^7.0.1",
     "punycode": "^2.1.1",
     "rxjs": "^7.5.7",
-    "ws": "^7.4.6",
+    "ws": "^8.18.3",
     "xsp-files": "^4.2.1"
   },
   "devDependencies": {
     "@types/jasmine": "^3.9.1",
     "@types/node": "^16.11.7",
-    "@types/ws": "^7.4.7",
+    "@types/ws": "^8.18.1",
     "jasmine": "^3.9.0",
     "protobufjs-cli": "^1.0.2",
     "spec-3nweb-server": "^1.8.0",