core-3nweb-client-lib 0.44.3 → 0.44.5

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

@@ -675,6 +675,7 @@ declare namespace web3n.files {
 
 	interface OptionsToDiffFileVersions {
 		remoteVersion?: number;
+		// XXX implicit assumption that mtime changes only when file content changes
 		compareContentIfSameMTime?: boolean;
 	}
 
@@ -1493,6 +1494,12 @@ declare namespace web3n.files {
 		 */
 		getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
 
+		// compareLocalAndRemoteFileItems(path: string, itemName: string, remoteVersion?: number): Promise<FileDiff>;
+
+		// compareLocalAndRemoteFolderItems(
+		// 	path: string, itemName: string, remoteVersion?: number
+		// ): Promise<FolderContentDiff>;
+
 		// XXX method to work around damaged files
 		// reloadFromServer(path: string): Promise<SyncStatus>;
 
@@ -1631,6 +1638,13 @@ declare namespace web3n.files {
 		};
 	}
 
+	// interface FolderContentDiff extends CommonDiff {
+	// 	local: ({
+
+	// 	} & ListingEntry)[];
+	// 	remote: ({} & ListingEntry)[];
+	// }
+
 	interface WritableFSSyncAPI extends ReadonlyFSSyncAPI {
 
 		/**
@@ -1669,15 +1683,18 @@ declare namespace web3n.files {
 
 		/**
 		 * This method is for resolving conflicts on folders.
-		 * It merges folder changes from remote version.
+		 * It absorbs folder changes done in remote version.
 		 * Returns new local version, if there were remote items to adopt and their were added to local state.
 		 * @param path 
 		 * @param opts
 		 */
-		mergeFolderCurrentAndRemoteVersions(
-			path: string, opts?: OptionsToMergeFolderVersions
+		absorbRemoteFolderChanges(
+			path: string, opts?: OptionsToAdoptRemoteFolderChanges
 		): Promise<number|undefined>;
 
+		// XXX
+		// makeSnapshot(path: string); // -> snapshot points and archives current versions of tree elements
+
 	}
 
 	interface OptionsToAdoptRemoteItem {
@@ -1700,7 +1717,7 @@ declare namespace web3n.files {
 		newItemName?: string;
 	}
 
-	interface OptionsToMergeFolderVersions {
+	interface OptionsToAdoptRemoteFolderChanges {
 		/**
 		 * Folder's local version. If not given, current local version is used.
 		 */

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

@@ -194,7 +194,7 @@ class SyncedStore {
         return obj.getObjSrcFromLocalAndSyncedBranch(version);
     }
     async getObjSrcOfRemoteVersion(objId, version) {
-        const obj = await this.getObjOrThrow(objId);
+        const obj = await this.getObjOrThrow(objId, true);
         return obj.getObjSrcFromRemoteAndSyncedBranch(version);
     }
     async saveObj(objId, version, encSub) {
@@ -225,7 +225,7 @@ class SyncedStore {
         await obj.removeCurrentVersion();
     }
     async getNumOfBytesNeedingDownload(objId, version) {
-        const obj = await this.getObjOrThrow(objId);
+        const obj = await this.getObjOrThrow(objId, true);
         return obj.getNumOfBytesNeedingDownload(version);
     }
     async close() {

package/build/core-ipc/fs.js

@@ -117,7 +117,7 @@ function makeFSCaller(caller, fsMsg) {
                 fs.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
                 fs.v.sync.upload = vsUpload.makeCaller(caller, vsPath);
                 fs.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.makeCaller(caller, vsPath);
-                fs.v.sync.mergeFolderCurrentAndRemoteVersions = vsMergeFolderCurrentAndRemoteVersions.makeCaller(caller, vsPath);
+                fs.v.sync.absorbRemoteFolderChanges = vsAbsorbRemoteFolderChanges.makeCaller(caller, vsPath);
             }
         }
     }
@@ -203,7 +203,7 @@ function exposeFSService(fs, expServices) {
                 implExp.v.sync.startUpload = vsStartUpload.wrapService(fs.v.sync.startUpload);
                 implExp.v.sync.upload = vsUpload.wrapService(fs.v.sync.upload);
                 implExp.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.wrapService(fs.v.sync.adoptRemoteFolderItem);
-                implExp.v.sync.mergeFolderCurrentAndRemoteVersions = vsMergeFolderCurrentAndRemoteVersions.wrapService(fs.v.sync.mergeFolderCurrentAndRemoteVersions);
+                implExp.v.sync.absorbRemoteFolderChanges = vsAbsorbRemoteFolderChanges.wrapService(fs.v.sync.absorbRemoteFolderChanges);
             }
         }
     }
@@ -1979,9 +1979,9 @@ var vsAdoptRemoteFolderItem;
     vsAdoptRemoteFolderItem.makeCaller = makeCaller;
 })(vsAdoptRemoteFolderItem || (vsAdoptRemoteFolderItem = {}));
 Object.freeze(vsAdoptRemoteFolderItem);
-var vsMergeFolderCurrentAndRemoteVersions;
-(function (vsMergeFolderCurrentAndRemoteVersions) {
-    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MergeFolderCurrentAndRemoteVersionsRequestBody);
+var vsAbsorbRemoteFolderChanges;
+(function (vsAbsorbRemoteFolderChanges) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AbsorbRemoteFolderChangesRequestBody);
     function optionsFromMsg(msg) {
         if (!msg) {
             return;
@@ -2002,7 +2002,7 @@ var vsMergeFolderCurrentAndRemoteVersions;
             postfixForNameOverlaps: (0, protobuf_msg_1.toOptVal)(opts.postfixForNameOverlaps),
         };
     }
-    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MergeFolderCurrentAndRemoteVersionsReplyBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AbsorbRemoteFolderChangesReplyBody);
     function wrapService(fn) {
         return buf => {
             const { path, opts } = requestType.unpack(buf);
@@ -2011,16 +2011,16 @@ var vsMergeFolderCurrentAndRemoteVersions;
             return { promise };
         };
     }
-    vsMergeFolderCurrentAndRemoteVersions.wrapService = wrapService;
+    vsAbsorbRemoteFolderChanges.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'mergeFolderCurrentAndRemoteVersions');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'absorbRemoteFolderChanges');
         return (path, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, opts: optionsToMsg(opts) }))
             .then(buf => (0, protobuf_msg_1.valOfOptInt)(replyType.unpack(buf).newVersion));
     }
-    vsMergeFolderCurrentAndRemoteVersions.makeCaller = makeCaller;
-})(vsMergeFolderCurrentAndRemoteVersions || (vsMergeFolderCurrentAndRemoteVersions = {}));
-Object.freeze(vsMergeFolderCurrentAndRemoteVersions);
+    vsAbsorbRemoteFolderChanges.makeCaller = makeCaller;
+})(vsAbsorbRemoteFolderChanges || (vsAbsorbRemoteFolderChanges = {}));
+Object.freeze(vsAbsorbRemoteFolderChanges);
 var vsAdoptRemote;
 (function (vsAdoptRemote) {
     const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptRemoteRequestBody);