core-3nweb-client-lib 0.43.14 → 0.43.16

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

@@ -1307,10 +1307,6 @@ declare namespace web3n.files {
 		 */
 		diffCurrentAndRemoteFolderVersions(path: string, remoteVersion?: number): Promise<FolderDiff|undefined>;
 
-
-		// XXX (Christmas methods)
-		// add following methods to read remote item, facilitating decisions in conflict situations.
-
 		/**
 		 * Returns stats of a child from remote version of a folder.
 		 * @param path of folder
@@ -1473,20 +1469,24 @@ declare namespace web3n.files {
 	interface RemoteVersionArchivalEvent extends FSEvent {
 		type: 'remote-version-archival';
 		archivedVersion: number;
+		syncStatus: SyncStatus;
 	}
 
 	interface RemoteArchVerRemovalEvent extends FSEvent {
 		type: 'remote-arch-ver-removal';
 		removedArchVer: number;
+		syncStatus: SyncStatus;
 	}
 
 	interface RemoteRemovalEvent extends FSEvent {
 		type: 'remote-removal';
+		syncStatus: SyncStatus;
 	}
 
 	interface RemoteChangeEvent extends FSEvent {
 		type: 'remote-change';
-		newVersion: number;
+		newRemoteVersion: number;
+		syncStatus: SyncStatus;
 	}
 
 	type UploadEvent = UploadStartEvent | UploadProgressEvent | UploadDoneEvent;

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

@@ -33,7 +33,6 @@ const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
  * events. Someone down the stream can react to these changes from remote.
  */
 class RemoteEvents {
-    // private listeningProc: Subscription|undefined = undefined;
     constructor(remoteStorage, files, broadcastNodeEvent, logError) {
         this.remoteStorage = remoteStorage;
         this.files = files;
@@ -68,19 +67,25 @@ class RemoteEvents {
     }
     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)) {
+            .pipe((0, operators_1.mergeMap)(async ({ newVer: newRemoteVersion, objId }) => {
+            var _a;
+            if (!Number.isInteger(newRemoteVersion) || (newRemoteVersion < 1)) {
                 return;
             }
             const obj = await this.files.findObj(objId);
             if (!obj) {
                 return;
             }
-            obj.statusObj().recordRemoteChange(newVer);
+            const syncStatus = obj.syncStatus().syncStatus();
+            if (!((_a = syncStatus.synced) === null || _a === void 0 ? void 0 : _a.latest) || (syncStatus.synced.latest >= newRemoteVersion)) {
+                return;
+            }
+            obj.statusObj().recordRemoteChange(newRemoteVersion);
             this.broadcastNodeEvent(obj.objId, undefined, undefined, {
                 type: 'remote-change',
                 path: '',
-                newVersion: newVer
+                newRemoteVersion,
+                syncStatus: obj.syncStatus().syncStatus()
             });
         }, 1));
     }
@@ -94,7 +99,8 @@ class RemoteEvents {
             obj.statusObj().recordRemoteRemoval();
             this.broadcastNodeEvent(obj.objId, undefined, undefined, {
                 type: 'remote-removal',
-                path: ''
+                path: '',
+                syncStatus: obj.syncStatus().syncStatus()
             });
         }, 1));
     }
@@ -109,7 +115,8 @@ class RemoteEvents {
             this.broadcastNodeEvent(obj.objId, undefined, undefined, {
                 type: 'remote-version-archival',
                 path: '',
-                archivedVersion: archivedVer
+                archivedVersion: archivedVer,
+                syncStatus: obj.syncStatus().syncStatus()
             });
         }, 1));
     }
@@ -124,7 +131,8 @@ class RemoteEvents {
             this.broadcastNodeEvent(obj.objId, undefined, undefined, {
                 type: 'remote-arch-ver-removal',
                 path: '',
-                removedArchVer: archivedVer
+                removedArchVer: archivedVer,
+                syncStatus: obj.syncStatus().syncStatus()
             });
         }, 1));
     }

package/build/core-ipc/fs.js

@@ -2001,7 +2001,7 @@ var vsStatRemoteItem;
     function wrapService(fn) {
         return buf => {
             const { path, remoteItemName, remoteVersion } = remoteChildReqType.unpack(buf);
-            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOpt)(remoteVersion))
+            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOptInt)(remoteVersion))
                 .then(file.packStats);
             return { promise };
         };
@@ -2023,7 +2023,7 @@ var vsListRemoteFolderItem;
     function wrapService(fn) {
         return buf => {
             const { path, remoteItemName, remoteVersion } = remoteChildReqType.unpack(buf);
-            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOpt)(remoteVersion))
+            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOptInt)(remoteVersion))
                 .then(listFolder.packFolderListing);
             return { promise };
         };
@@ -2045,7 +2045,7 @@ var vsGetRemoteFileItem;
     function wrapService(fn, expServices) {
         return buf => {
             const { path, remoteItemName, remoteVersion } = remoteChildReqType.unpack(buf);
-            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOpt)(remoteVersion))
+            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOptInt)(remoteVersion))
                 .then(file => {
                 const fileMsg = (0, file_1.exposeFileService)(file, expServices);
                 return file_1.fileMsgType.pack(fileMsg);