core-3nweb-client-lib 0.43.17 → 0.43.19

package/package.json

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

package/protos/fs.proto

@@ -273,21 +273,21 @@ message VersionedReadBytesRequestBody {
 // ==== WritableFS referable as impl object (extends ReadonlyFS) ====
 
 // --- WritableFS.updateXAttrs ---
-// Reply has only status and body is empty
+// Reply body is empty
 message UpdateXAttrsRequestBody {
 	string path = 1;
 	file.XAttrsChanges changes = 2;
 }
 
 // --- WritableFS.makeFolder ---
-// Reply has only status and body is empty
+// Reply body is empty
 message MakeFolderRequestBody {
 	string path = 1;
 	common.BooleanValue exclusive = 2;
 }
 
 // --- WritableFS.deleteFolder ---
-// Reply has only status and body is empty
+// Reply body is empty
 message DeleteFolderRequestBody {
 	string path = 1;
 	common.BooleanValue remove_content = 2;
@@ -295,17 +295,17 @@ message DeleteFolderRequestBody {
 
 // --- WritableFS.deleteFile ---
 // Request body is PathOnlyRequestBody
-// Reply has only status and body is empty
+// Reply body is empty
 
 // --- WritableFS.move ---
-// Reply has only status and body is empty
+// Reply body is empty
 message MoveRequestBody {
 	string src = 1;
 	string dst = 2;
 }
 
 // --- WritableFS.copyFile ---
-// Reply has only status and body is empty
+// Reply body is empty
 message CopyFileRequestBody {
 	string src = 1;
 	string dst = 2;
@@ -313,7 +313,7 @@ message CopyFileRequestBody {
 }
 
 // --- WritableFS.copyFolder ---
-// Reply has only status and body is empty
+// Reply body is empty
 message CopyFolderRequestBody {
 	string src = 1;
 	string dst = 2;
@@ -321,7 +321,7 @@ message CopyFolderRequestBody {
 }
 
 // --- WritableFS.saveFile ---
-// Reply has only status and body is empty
+// Reply body is empty
 message SaveFileRequestBody {
 	// file is a reference to File impl object
 	common.ObjectReference file = 1;
@@ -330,7 +330,7 @@ message SaveFileRequestBody {
 }
 
 // --- WritableFS.saveFolder ---
-// Reply has only status and body is empty
+// Reply body is empty
 message SaveFolderRequestBody {
 	// file is a reference to FS impl object
 	common.ObjectReference folder = 1;
@@ -340,10 +340,10 @@ message SaveFolderRequestBody {
 
 // --- WritableFS.deleteLink ---
 // Request body is PathOnlyRequestBody
-// Reply has only status and body is empty
+// Reply body is empty
 
 // --- WritableFS.link ---
-// Reply has only status and body is empty
+// Reply body is empty
 message LinkRequestBody {
 	string path = 1;
 	// target is a reference to either FS or File impl object
@@ -366,7 +366,7 @@ message FileFlags {
 }
 
 // --- WritableFS.writeJSONFile ---
-// Reply has only status and body is empty
+// Reply body is empty
 message WriteJsonFileRequestBody {
 	string path = 1;
 	string json = 2;
@@ -374,7 +374,7 @@ message WriteJsonFileRequestBody {
 }
 
 // --- WritableFS.writeTxtFile ---
-// Reply has only status and body is empty
+// Reply body is empty
 message WriteTxtFileRequestBody {
 	string path = 1;
 	string txt = 2;
@@ -382,7 +382,7 @@ message WriteTxtFileRequestBody {
 }
 
 // --- WritableFS.writeBytes ---
-// Reply has only status and body is empty
+// Reply body is empty
 message WriteBytesRequestBody {
 	string path = 1;
 	bytes bytes = 2;
@@ -470,14 +470,14 @@ message FSSyncIsOnDiskReplyBody {
 }
 
 // --- ReadonlyFSSyncAPI.startDownload ---
-// Reply has only status and body is file.FileSyncStartDownloadReplyBody
+// Reply body is file.FileSyncStartDownloadReplyBody
 message FSSyncStartDownloadRequestBody {
 	string path = 1;
 	uint64 version = 2;
 }
 
 // --- ReadonlyFSSyncAPI.adoptRemote ---
-// Reply has only status and body is empty
+// Reply body is empty
 message AdoptRemoteRequestBody {
 	string path = 1;
 	file.OptionsToAdopteRemote opts = 2;
@@ -502,6 +502,10 @@ message FolderDiff {
 		repeated file.NameAndXAttrValue in_remote = 2;
 		repeated string name_overlaps = 3;
 	}
+	message DifferentNames {
+		string local_name = 1;
+		string remote_name = 2;
+	}
 	uint64 current_version = 1;
 	common.UInt64Value remote_version = 2;
 	repeated ListingEntryMsg in_current = 3;
@@ -510,6 +514,8 @@ message FolderDiff {
 	TimeStamps ctime = 6;
 	TimeStamps mtime = 7;
 	XAttrs xattrs = 8;
+	repeated string different_keys = 9;
+	repeated DifferentNames different_names = 10;
 }
 
 message RemoteChildRequestBody {
@@ -549,6 +555,7 @@ message FSSyncUploadRequestBody {
 // Reply body is file.FileSyncStartUploadReplyBody
 
 // --- WritableFSSyncAPI.adoptRemoteFolderItem ---
+// Reply body is common.UInt64Value
 message AdoptRemoteFolderItemRequestBody {
 	message Options {
 		common.UInt64Value local_version = 1;
@@ -560,3 +567,18 @@ message AdoptRemoteFolderItemRequestBody {
 	string item_name = 2;
 	Options opts = 3;
 }
+
+// --- WritableFSSyncAPI.adoptAllRemoteFolderItems ---
+// Reply body is common.UInt64Value
+message AdoptAllRemoteFolderItemsRequestBody {
+	message Options {
+		common.UInt64Value local_version = 1;
+		common.StringValue postfix_for_name_overlaps = 2;
+		common.UInt64Value remote_version = 3;
+	}
+	string path = 1;
+	Options opts = 2;
+}
+message AdoptAllRemoteFolderItemsReplyBody {
+	common.UInt64Value new_version = 1;
+}