core-3nweb-client-lib 0.43.15 → 0.43.17

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

@@ -1331,8 +1331,13 @@ declare namespace web3n.files {
 		 */
 		getRemoteFileItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFile>;
 
+		getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
+
 	}
 
+	/**
+	 * 
+	 */
 	interface FolderDiff {
 		currentVersion: number;
 		isCurrentLocal: boolean;
@@ -1340,6 +1345,10 @@ declare namespace web3n.files {
 		isRemoteArchived: boolean;
 		inCurrent?: ListingEntry[];
 		inRemote?: ListingEntry[];
+
+		// XXX 
+		// differentNames?: ;
+
 		nameOverlaps?: string[];
 		ctime: {
 			remote?: Date;
@@ -1469,20 +1478,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/id-manager/index.js

@@ -66,10 +66,7 @@ class IdManager {
             }
             return {
                 idManager,
-                setupManagerStorage: (fs, keys) => setupManagerStorage(fs, (keys ? {
-                    address: idManager.address,
-                    keys
-                } : undefined))
+                setupManagerStorage: (fs, keys) => setupManagerStorage(fs, (keys ? { address: idManager.address, keys } : undefined))
             };
         };
     }

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

@@ -111,6 +111,7 @@ function makeFSCaller(caller, fsMsg) {
                 statRemoteItem: vsStatRemoteItem.makeCaller(caller, vsPath),
                 listRemoteFolderItem: vsListRemoteFolderItem.makeCaller(caller, vsPath),
                 getRemoteFileItem: vsGetRemoteFileItem.makeCaller(caller, vsPath),
+                getRemoteFolderItem: vsGetRemoteFolderItem.makeCaller(caller, vsPath),
             };
             if (fs.writable) {
                 fs.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
@@ -192,6 +193,7 @@ function exposeFSService(fs, expServices) {
                 statRemoteItem: vsStatRemoteItem.wrapService(fs.v.sync.statRemoteItem),
                 listRemoteFolderItem: vsListRemoteFolderItem.wrapService(fs.v.sync.listRemoteFolderItem),
                 getRemoteFileItem: vsGetRemoteFileItem.wrapService(fs.v.sync.getRemoteFileItem, expServices),
+                getRemoteFolderItem: vsGetRemoteFolderItem.wrapService(fs.v.sync.getRemoteFolderItem, expServices),
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions)
             };
             if (fs.writable) {
@@ -2068,6 +2070,34 @@ var vsGetRemoteFileItem;
     vsGetRemoteFileItem.makeCaller = makeCaller;
 })(vsGetRemoteFileItem || (vsGetRemoteFileItem = {}));
 Object.freeze(vsGetRemoteFileItem);
+var vsGetRemoteFolderItem;
+(function (vsGetRemoteFolderItem) {
+    function wrapService(fn, expServices) {
+        return buf => {
+            const { path, remoteItemName, remoteVersion } = remoteChildReqType.unpack(buf);
+            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOptInt)(remoteVersion))
+                .then(fs => {
+                const fsMsg = exposeFSService(fs, expServices);
+                return exports.fsMsgType.pack(fsMsg);
+            });
+            return { promise };
+        };
+    }
+    vsGetRemoteFolderItem.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getRemoteFolderItem');
+        return (path, remoteItemName, remoteVersion) => caller
+            .startPromiseCall(ipcPath, remoteChildReqType.pack({
+            path, remoteItemName, remoteVersion: (0, protobuf_msg_1.toOptVal)(remoteVersion)
+        }))
+            .then(buf => {
+            const fsMsg = exports.fsMsgType.unpack(buf);
+            return makeFSCaller(caller, fsMsg);
+        });
+    }
+    vsGetRemoteFolderItem.makeCaller = makeCaller;
+})(vsGetRemoteFolderItem || (vsGetRemoteFolderItem = {}));
+Object.freeze(vsGetRemoteFolderItem);
 var vListVersions;
 (function (vListVersions) {
     function wrapService(fn) {