core-3nweb-client-lib 0.43.18 → 0.43.19

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

@@ -1281,9 +1281,7 @@ declare namespace web3n.files {
 		 * Returns a state of on-disk cache of an item in fs.
 		 * @param version 
 		 */
-		isRemoteVersionOnDisk(
-			path: string, version: number
-		): Promise<'partial'|'complete'|'none'>;
+		isRemoteVersionOnDisk(path: string, version: number): Promise<'partial'|'complete'|'none'>;
 
 		/**
 		 * This downloads bytes onto disk, skipping decryption, as item's content isn't read here.
@@ -1301,7 +1299,7 @@ declare namespace web3n.files {
 		adoptRemote(path: string, opts?: OptionsToAdopteRemote): Promise<void>;
 
 		/**
-		 * Calculates diff between current local and remote states of folder at given path.
+		 * Calculates diff between current and remote states of folder at given path.
 		 * @param path 
 		 * @param remoteVersion 
 		 */
@@ -1345,32 +1343,83 @@ declare namespace web3n.files {
 	}
 
 	/**
-	 * 
+	 * Difference between two versions of folder node.
+	 * Folder items that same in both versions are not included.
 	 */
 	interface FolderDiff {
+		/**
+		 * Current version against which this diff is done.
+		 */
 		currentVersion: number;
+
+		/**
+		 * Flag indicating if current version is local, i.e. never uploaded.
+		 */
 		isCurrentLocal: boolean;
+
+		/**
+		 * Remote version against which this diff is done.
+		 */
 		remoteVersion?: number;
+
+		/**
+		 * Flag indicating if remote version is archived.
+		 * If remote is archived/delete, it has nothing inside, and with this implicit
+		 * understanding there is no need to have other data fields populated here.
+		 */
 		isRemoteArchived: boolean;
+
+		/**
+		 * Items present only in current version.
+		 */
 		inCurrent?: ListingEntry[];
+
+		/**
+		 * Items present only in remote version.
+		 */
 		inRemote?: ListingEntry[];
 
-		// XXX add indication for items that have different name
+		/**
+		 * Different names are for items that are same nodes but have different names
+		 * in local and remote branches.
+		 */
 		differentNames?: {
 			localName: string;
 			remoteName: string;
 		}[];
+
+		/**
+		 * Different keys identifies items that have different encryption keys in
+		 * local and remote branches. Keys may be changed, hence, given situation
+		 * should be reflected.
+		 */
 		differentKeys?: string[];
 
+		/**
+		 * Name overlaps are items with same name, but different node objects underneath.
+		 */
 		nameOverlaps?: string[];
+
+		/**
+		 * Creation time should always be same.
+		 * But there is no way to enforce it, hence, we have this field.
+		 */
 		ctime: {
 			remote?: Date;
 			current: Date;
 		};
+
+		/**
+		 * Modification time most probably be different between versions.
+		 */
 		mtime: {
 			remote?: Date;
 			current: Date;
 		};
+
+		/**
+		 * Difference between xattrs. Same xattrs in both versions are not included.
+		 */
 		xattrs?: {
 			inCurrent?: { name: string; value: any; }[];
 			inRemote?: { name: string; value: any; }[];

package/build/core-ipc/fs.js

@@ -199,7 +199,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.adoptAllRemoteFolderItems = vsAdoptAllRemoteItems.wrapService(fs.v.sync.adoptAllRemoteItems);
+                implExp.v.sync.adoptAllRemoteItems = vsAdoptAllRemoteItems.wrapService(fs.v.sync.adoptAllRemoteItems);
             }
         }
     }
@@ -2012,7 +2012,7 @@ var vsAdoptAllRemoteItems;
         const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'adoptAllRemoteItems');
         return (path, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, opts: optionsToMsg(opts) }))
-            .then(buf => (0, protobuf_msg_1.valOfOpt)(replyType.unpack(buf).newVersion));
+            .then(buf => (0, protobuf_msg_1.valOfOptInt)(replyType.unpack(buf).newVersion));
     }
     vsAdoptAllRemoteItems.makeCaller = makeCaller;
 })(vsAdoptAllRemoteItems || (vsAdoptAllRemoteItems = {}));
@@ -2194,6 +2194,8 @@ function folderDiffToMsg(diff) {
         inCurrent: (_a = diff.inCurrent) === null || _a === void 0 ? void 0 : _a.map(lsEntryToMsg),
         inRemote: (_b = diff.inRemote) === null || _b === void 0 ? void 0 : _b.map(lsEntryToMsg),
         nameOverlaps: diff.nameOverlaps,
+        differentKeys: diff.differentKeys,
+        differentNames: diff.differentNames,
         ctime: diffTStoMsg(diff.ctime),
         mtime: diffTStoMsg(diff.mtime),
         xattrs: (diff.xattrs ? {
@@ -2219,20 +2221,19 @@ function folderDiffFromMsg(msg) {
         currentVersion: (0, protobuf_msg_1.fixInt)(msg.currentVersion),
         isCurrentLocal: msg.isCurrentLocal,
         isRemoteArchived: msg.isRemoteArchived,
-        inCurrent: ((msg.inCurrent.length > 0) ?
-            msg.inCurrent.map(lsEntryFromMsg) : undefined),
-        inRemote: ((msg.inRemote.length > 0) ?
-            msg.inRemote.map(lsEntryFromMsg) : undefined),
-        nameOverlaps: ((msg.nameOverlaps.length > 0) ?
-            msg.nameOverlaps : undefined),
+        inCurrent: ((msg.inCurrent && (msg.inCurrent.length > 0)) ? msg.inCurrent.map(lsEntryFromMsg) : undefined),
+        inRemote: ((msg.inRemote && (msg.inRemote.length > 0)) ? msg.inRemote.map(lsEntryFromMsg) : undefined),
+        nameOverlaps: ((msg.nameOverlaps && (msg.nameOverlaps.length > 0)) ? msg.nameOverlaps : undefined),
+        differentKeys: ((msg.differentKeys && (msg.differentKeys.length > 0)) ? msg.differentKeys : undefined),
+        differentNames: ((msg.differentNames && (msg.differentNames.length > 0)) ? msg.differentNames : undefined),
         ctime: diffTSfromMsg(msg.ctime),
         mtime: diffTSfromMsg(msg.mtime),
         xattrs: (msg.xattrs ? {
-            inCurrent: ((msg.xattrs.inCurrent.length > 0) ?
+            inCurrent: ((msg.xattrs.inCurrent && (msg.xattrs.inCurrent.length > 0)) ?
                 msg.xattrs.inCurrent.map(file.xattrFromMsg) : undefined),
-            inRemote: ((msg.xattrs.inRemote.length > 0) ?
+            inRemote: ((msg.xattrs.inRemote && (msg.xattrs.inRemote.length > 0)) ?
                 msg.xattrs.inRemote.map(file.xattrFromMsg) : undefined),
-            nameOverlaps: ((msg.xattrs.nameOverlaps.length > 0) ?
+            nameOverlaps: ((msg.xattrs.nameOverlaps && (msg.xattrs.nameOverlaps.length > 0)) ?
                 msg.xattrs.nameOverlaps : undefined)
         } : undefined)
     };

package/build/lib-client/xsp-fs/folder-node.js

@@ -402,7 +402,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                         newName = `${newName}${postfix}`;
                     }
                     node.name = newName;
-                    state[newName] = node;
+                    state.nodes[newName] = node;
                     addedNodes.add(itemName);
                 }
             }
@@ -411,7 +411,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                     continue;
                 }
                 const node = remoteState.nodes[itemName];
-                state[itemName] = node;
+                state.nodes[itemName] = node;
             }
             return [];
         });
@@ -1109,7 +1109,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
     }
     diffWithRemote(isCurrentLocal, remoteVersion, folderInfo, attrs, xattrs) {
         const { ctime, mtime } = diffAttrs(this.attrs, attrs);
-        const { inCurrent, inRemote, nameOverlaps } = diffNodes(this.currentState, folderInfo);
+        const { inCurrent, inRemote, nameOverlaps, differentKeys, differentNames } = diffNodes(this.currentState, folderInfo);
         return {
             currentVersion: this.version,
             isCurrentLocal,
@@ -1118,6 +1118,8 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             inCurrent,
             inRemote,
             nameOverlaps,
+            differentKeys,
+            differentNames,
             ctime,
             mtime,
             xattrs: diffXAttrs(this.xattrs, xattrs)

package/build/protos/asmail.proto.js

@@ -32082,6 +32082,8 @@ $root.fs = (function() {
          * @property {fs.FolderDiff.ITimeStamps|null} [ctime] FolderDiff ctime
          * @property {fs.FolderDiff.ITimeStamps|null} [mtime] FolderDiff mtime
          * @property {fs.FolderDiff.IXAttrs|null} [xattrs] FolderDiff xattrs
+         * @property {Array.<string>|null} [differentKeys] FolderDiff differentKeys
+         * @property {Array.<fs.FolderDiff.IDifferentNames>|null} [differentNames] FolderDiff differentNames
          */
 
         /**
@@ -32096,6 +32098,8 @@ $root.fs = (function() {
             this.inCurrent = [];
             this.inRemote = [];
             this.nameOverlaps = [];
+            this.differentKeys = [];
+            this.differentNames = [];
             if (properties)
                 for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                     if (properties[keys[i]] != null)
@@ -32166,6 +32170,22 @@ $root.fs = (function() {
          */
         FolderDiff.prototype.xattrs = null;
 
+        /**
+         * FolderDiff differentKeys.
+         * @member {Array.<string>} differentKeys
+         * @memberof fs.FolderDiff
+         * @instance
+         */
+        FolderDiff.prototype.differentKeys = $util.emptyArray;
+
+        /**
+         * FolderDiff differentNames.
+         * @member {Array.<fs.FolderDiff.IDifferentNames>} differentNames
+         * @memberof fs.FolderDiff
+         * @instance
+         */
+        FolderDiff.prototype.differentNames = $util.emptyArray;
+
         /**
          * Creates a new FolderDiff instance using the specified properties.
          * @function create
@@ -32209,6 +32229,12 @@ $root.fs = (function() {
                 $root.fs.FolderDiff.TimeStamps.encode(message.mtime, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim();
             if (message.xattrs != null && Object.hasOwnProperty.call(message, "xattrs"))
                 $root.fs.FolderDiff.XAttrs.encode(message.xattrs, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim();
+            if (message.differentKeys != null && message.differentKeys.length)
+                for (var i = 0; i < message.differentKeys.length; ++i)
+                    writer.uint32(/* id 9, wireType 2 =*/74).string(message.differentKeys[i]);
+            if (message.differentNames != null && message.differentNames.length)
+                for (var i = 0; i < message.differentNames.length; ++i)
+                    $root.fs.FolderDiff.DifferentNames.encode(message.differentNames[i], writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim();
             return writer;
         };
 
@@ -32283,6 +32309,18 @@ $root.fs = (function() {
                         message.xattrs = $root.fs.FolderDiff.XAttrs.decode(reader, reader.uint32());
                         break;
                     }
+                case 9: {
+                        if (!(message.differentKeys && message.differentKeys.length))
+                            message.differentKeys = [];
+                        message.differentKeys.push(reader.string());
+                        break;
+                    }
+                case 10: {
+                        if (!(message.differentNames && message.differentNames.length))
+                            message.differentNames = [];
+                        message.differentNames.push($root.fs.FolderDiff.DifferentNames.decode(reader, reader.uint32()));
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -32366,6 +32404,22 @@ $root.fs = (function() {
                 if (error)
                     return "xattrs." + error;
             }
+            if (message.differentKeys != null && message.hasOwnProperty("differentKeys")) {
+                if (!Array.isArray(message.differentKeys))
+                    return "differentKeys: array expected";
+                for (var i = 0; i < message.differentKeys.length; ++i)
+                    if (!$util.isString(message.differentKeys[i]))
+                        return "differentKeys: string[] expected";
+            }
+            if (message.differentNames != null && message.hasOwnProperty("differentNames")) {
+                if (!Array.isArray(message.differentNames))
+                    return "differentNames: array expected";
+                for (var i = 0; i < message.differentNames.length; ++i) {
+                    var error = $root.fs.FolderDiff.DifferentNames.verify(message.differentNames[i]);
+                    if (error)
+                        return "differentNames." + error;
+                }
+            }
             return null;
         };
 
@@ -32437,6 +32491,23 @@ $root.fs = (function() {
                     throw TypeError(".fs.FolderDiff.xattrs: object expected");
                 message.xattrs = $root.fs.FolderDiff.XAttrs.fromObject(object.xattrs);
             }
+            if (object.differentKeys) {
+                if (!Array.isArray(object.differentKeys))
+                    throw TypeError(".fs.FolderDiff.differentKeys: array expected");
+                message.differentKeys = [];
+                for (var i = 0; i < object.differentKeys.length; ++i)
+                    message.differentKeys[i] = String(object.differentKeys[i]);
+            }
+            if (object.differentNames) {
+                if (!Array.isArray(object.differentNames))
+                    throw TypeError(".fs.FolderDiff.differentNames: array expected");
+                message.differentNames = [];
+                for (var i = 0; i < object.differentNames.length; ++i) {
+                    if (typeof object.differentNames[i] !== "object")
+                        throw TypeError(".fs.FolderDiff.differentNames: object expected");
+                    message.differentNames[i] = $root.fs.FolderDiff.DifferentNames.fromObject(object.differentNames[i]);
+                }
+            }
             return message;
         };
 
@@ -32457,6 +32528,8 @@ $root.fs = (function() {
                 object.inCurrent = [];
                 object.inRemote = [];
                 object.nameOverlaps = [];
+                object.differentKeys = [];
+                object.differentNames = [];
             }
             if (options.defaults) {
                 if ($util.Long) {
@@ -32497,6 +32570,16 @@ $root.fs = (function() {
                 object.mtime = $root.fs.FolderDiff.TimeStamps.toObject(message.mtime, options);
             if (message.xattrs != null && message.hasOwnProperty("xattrs"))
                 object.xattrs = $root.fs.FolderDiff.XAttrs.toObject(message.xattrs, options);
+            if (message.differentKeys && message.differentKeys.length) {
+                object.differentKeys = [];
+                for (var j = 0; j < message.differentKeys.length; ++j)
+                    object.differentKeys[j] = message.differentKeys[j];
+            }
+            if (message.differentNames && message.differentNames.length) {
+                object.differentNames = [];
+                for (var j = 0; j < message.differentNames.length; ++j)
+                    object.differentNames[j] = $root.fs.FolderDiff.DifferentNames.toObject(message.differentNames[j], options);
+            }
             return object;
         };
 
@@ -33084,6 +33167,235 @@ $root.fs = (function() {
             return XAttrs;
         })();
 
+        FolderDiff.DifferentNames = (function() {
+
+            /**
+             * Properties of a DifferentNames.
+             * @memberof fs.FolderDiff
+             * @interface IDifferentNames
+             * @property {string|null} [localName] DifferentNames localName
+             * @property {string|null} [remoteName] DifferentNames remoteName
+             */
+
+            /**
+             * Constructs a new DifferentNames.
+             * @memberof fs.FolderDiff
+             * @classdesc Represents a DifferentNames.
+             * @implements IDifferentNames
+             * @constructor
+             * @param {fs.FolderDiff.IDifferentNames=} [properties] Properties to set
+             */
+            function DifferentNames(properties) {
+                if (properties)
+                    for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                        if (properties[keys[i]] != null)
+                            this[keys[i]] = properties[keys[i]];
+            }
+
+            /**
+             * DifferentNames localName.
+             * @member {string} localName
+             * @memberof fs.FolderDiff.DifferentNames
+             * @instance
+             */
+            DifferentNames.prototype.localName = "";
+
+            /**
+             * DifferentNames remoteName.
+             * @member {string} remoteName
+             * @memberof fs.FolderDiff.DifferentNames
+             * @instance
+             */
+            DifferentNames.prototype.remoteName = "";
+
+            /**
+             * Creates a new DifferentNames instance using the specified properties.
+             * @function create
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.IDifferentNames=} [properties] Properties to set
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames instance
+             */
+            DifferentNames.create = function create(properties) {
+                return new DifferentNames(properties);
+            };
+
+            /**
+             * Encodes the specified DifferentNames message. Does not implicitly {@link fs.FolderDiff.DifferentNames.verify|verify} messages.
+             * @function encode
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.IDifferentNames} message DifferentNames message or plain object to encode
+             * @param {$protobuf.Writer} [writer] Writer to encode to
+             * @returns {$protobuf.Writer} Writer
+             */
+            DifferentNames.encode = function encode(message, writer) {
+                if (!writer)
+                    writer = $Writer.create();
+                if (message.localName != null && Object.hasOwnProperty.call(message, "localName"))
+                    writer.uint32(/* id 1, wireType 2 =*/10).string(message.localName);
+                if (message.remoteName != null && Object.hasOwnProperty.call(message, "remoteName"))
+                    writer.uint32(/* id 2, wireType 2 =*/18).string(message.remoteName);
+                return writer;
+            };
+
+            /**
+             * Encodes the specified DifferentNames message, length delimited. Does not implicitly {@link fs.FolderDiff.DifferentNames.verify|verify} messages.
+             * @function encodeDelimited
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.IDifferentNames} message DifferentNames message or plain object to encode
+             * @param {$protobuf.Writer} [writer] Writer to encode to
+             * @returns {$protobuf.Writer} Writer
+             */
+            DifferentNames.encodeDelimited = function encodeDelimited(message, writer) {
+                return this.encode(message, writer).ldelim();
+            };
+
+            /**
+             * Decodes a DifferentNames message from the specified reader or buffer.
+             * @function decode
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+             * @param {number} [length] Message length if known beforehand
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames
+             * @throws {Error} If the payload is not a reader or valid buffer
+             * @throws {$protobuf.util.ProtocolError} If required fields are missing
+             */
+            DifferentNames.decode = function decode(reader, length, error) {
+                if (!(reader instanceof $Reader))
+                    reader = $Reader.create(reader);
+                var end = length === undefined ? reader.len : reader.pos + length, message = new $root.fs.FolderDiff.DifferentNames();
+                while (reader.pos < end) {
+                    var tag = reader.uint32();
+                    if (tag === error)
+                        break;
+                    switch (tag >>> 3) {
+                    case 1: {
+                            message.localName = reader.string();
+                            break;
+                        }
+                    case 2: {
+                            message.remoteName = reader.string();
+                            break;
+                        }
+                    default:
+                        reader.skipType(tag & 7);
+                        break;
+                    }
+                }
+                return message;
+            };
+
+            /**
+             * Decodes a DifferentNames message from the specified reader or buffer, length delimited.
+             * @function decodeDelimited
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames
+             * @throws {Error} If the payload is not a reader or valid buffer
+             * @throws {$protobuf.util.ProtocolError} If required fields are missing
+             */
+            DifferentNames.decodeDelimited = function decodeDelimited(reader) {
+                if (!(reader instanceof $Reader))
+                    reader = new $Reader(reader);
+                return this.decode(reader, reader.uint32());
+            };
+
+            /**
+             * Verifies a DifferentNames message.
+             * @function verify
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {Object.<string,*>} message Plain object to verify
+             * @returns {string|null} `null` if valid, otherwise the reason why it is not
+             */
+            DifferentNames.verify = function verify(message) {
+                if (typeof message !== "object" || message === null)
+                    return "object expected";
+                if (message.localName != null && message.hasOwnProperty("localName"))
+                    if (!$util.isString(message.localName))
+                        return "localName: string expected";
+                if (message.remoteName != null && message.hasOwnProperty("remoteName"))
+                    if (!$util.isString(message.remoteName))
+                        return "remoteName: string expected";
+                return null;
+            };
+
+            /**
+             * Creates a DifferentNames message from a plain object. Also converts values to their respective internal types.
+             * @function fromObject
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {Object.<string,*>} object Plain object
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames
+             */
+            DifferentNames.fromObject = function fromObject(object) {
+                if (object instanceof $root.fs.FolderDiff.DifferentNames)
+                    return object;
+                var message = new $root.fs.FolderDiff.DifferentNames();
+                if (object.localName != null)
+                    message.localName = String(object.localName);
+                if (object.remoteName != null)
+                    message.remoteName = String(object.remoteName);
+                return message;
+            };
+
+            /**
+             * Creates a plain object from a DifferentNames message. Also converts values to other types if specified.
+             * @function toObject
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.DifferentNames} message DifferentNames
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
+             * @returns {Object.<string,*>} Plain object
+             */
+            DifferentNames.toObject = function toObject(message, options) {
+                if (!options)
+                    options = {};
+                var object = {};
+                if (options.defaults) {
+                    object.localName = "";
+                    object.remoteName = "";
+                }
+                if (message.localName != null && message.hasOwnProperty("localName"))
+                    object.localName = message.localName;
+                if (message.remoteName != null && message.hasOwnProperty("remoteName"))
+                    object.remoteName = message.remoteName;
+                return object;
+            };
+
+            /**
+             * Converts this DifferentNames to JSON.
+             * @function toJSON
+             * @memberof fs.FolderDiff.DifferentNames
+             * @instance
+             * @returns {Object.<string,*>} JSON object
+             */
+            DifferentNames.prototype.toJSON = function toJSON() {
+                return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+            };
+
+            /**
+             * Gets the default type url for DifferentNames
+             * @function getTypeUrl
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+             * @returns {string} The default type url
+             */
+            DifferentNames.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+                if (typeUrlPrefix === undefined) {
+                    typeUrlPrefix = "type.googleapis.com";
+                }
+                return typeUrlPrefix + "/fs.FolderDiff.DifferentNames";
+            };
+
+            return DifferentNames;
+        })();
+
         return FolderDiff;
     })();
 

package/build/protos/fs.proto.js

@@ -13103,6 +13103,8 @@ $root.fs = (function() {
          * @property {fs.FolderDiff.ITimeStamps|null} [ctime] FolderDiff ctime
          * @property {fs.FolderDiff.ITimeStamps|null} [mtime] FolderDiff mtime
          * @property {fs.FolderDiff.IXAttrs|null} [xattrs] FolderDiff xattrs
+         * @property {Array.<string>|null} [differentKeys] FolderDiff differentKeys
+         * @property {Array.<fs.FolderDiff.IDifferentNames>|null} [differentNames] FolderDiff differentNames
          */
 
         /**
@@ -13117,6 +13119,8 @@ $root.fs = (function() {
             this.inCurrent = [];
             this.inRemote = [];
             this.nameOverlaps = [];
+            this.differentKeys = [];
+            this.differentNames = [];
             if (properties)
                 for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                     if (properties[keys[i]] != null)
@@ -13187,6 +13191,22 @@ $root.fs = (function() {
          */
         FolderDiff.prototype.xattrs = null;
 
+        /**
+         * FolderDiff differentKeys.
+         * @member {Array.<string>} differentKeys
+         * @memberof fs.FolderDiff
+         * @instance
+         */
+        FolderDiff.prototype.differentKeys = $util.emptyArray;
+
+        /**
+         * FolderDiff differentNames.
+         * @member {Array.<fs.FolderDiff.IDifferentNames>} differentNames
+         * @memberof fs.FolderDiff
+         * @instance
+         */
+        FolderDiff.prototype.differentNames = $util.emptyArray;
+
         /**
          * Creates a new FolderDiff instance using the specified properties.
          * @function create
@@ -13230,6 +13250,12 @@ $root.fs = (function() {
                 $root.fs.FolderDiff.TimeStamps.encode(message.mtime, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim();
             if (message.xattrs != null && Object.hasOwnProperty.call(message, "xattrs"))
                 $root.fs.FolderDiff.XAttrs.encode(message.xattrs, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim();
+            if (message.differentKeys != null && message.differentKeys.length)
+                for (var i = 0; i < message.differentKeys.length; ++i)
+                    writer.uint32(/* id 9, wireType 2 =*/74).string(message.differentKeys[i]);
+            if (message.differentNames != null && message.differentNames.length)
+                for (var i = 0; i < message.differentNames.length; ++i)
+                    $root.fs.FolderDiff.DifferentNames.encode(message.differentNames[i], writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim();
             return writer;
         };
 
@@ -13304,6 +13330,18 @@ $root.fs = (function() {
                         message.xattrs = $root.fs.FolderDiff.XAttrs.decode(reader, reader.uint32());
                         break;
                     }
+                case 9: {
+                        if (!(message.differentKeys && message.differentKeys.length))
+                            message.differentKeys = [];
+                        message.differentKeys.push(reader.string());
+                        break;
+                    }
+                case 10: {
+                        if (!(message.differentNames && message.differentNames.length))
+                            message.differentNames = [];
+                        message.differentNames.push($root.fs.FolderDiff.DifferentNames.decode(reader, reader.uint32()));
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -13387,6 +13425,22 @@ $root.fs = (function() {
                 if (error)
                     return "xattrs." + error;
             }
+            if (message.differentKeys != null && message.hasOwnProperty("differentKeys")) {
+                if (!Array.isArray(message.differentKeys))
+                    return "differentKeys: array expected";
+                for (var i = 0; i < message.differentKeys.length; ++i)
+                    if (!$util.isString(message.differentKeys[i]))
+                        return "differentKeys: string[] expected";
+            }
+            if (message.differentNames != null && message.hasOwnProperty("differentNames")) {
+                if (!Array.isArray(message.differentNames))
+                    return "differentNames: array expected";
+                for (var i = 0; i < message.differentNames.length; ++i) {
+                    var error = $root.fs.FolderDiff.DifferentNames.verify(message.differentNames[i]);
+                    if (error)
+                        return "differentNames." + error;
+                }
+            }
             return null;
         };
 
@@ -13458,6 +13512,23 @@ $root.fs = (function() {
                     throw TypeError(".fs.FolderDiff.xattrs: object expected");
                 message.xattrs = $root.fs.FolderDiff.XAttrs.fromObject(object.xattrs);
             }
+            if (object.differentKeys) {
+                if (!Array.isArray(object.differentKeys))
+                    throw TypeError(".fs.FolderDiff.differentKeys: array expected");
+                message.differentKeys = [];
+                for (var i = 0; i < object.differentKeys.length; ++i)
+                    message.differentKeys[i] = String(object.differentKeys[i]);
+            }
+            if (object.differentNames) {
+                if (!Array.isArray(object.differentNames))
+                    throw TypeError(".fs.FolderDiff.differentNames: array expected");
+                message.differentNames = [];
+                for (var i = 0; i < object.differentNames.length; ++i) {
+                    if (typeof object.differentNames[i] !== "object")
+                        throw TypeError(".fs.FolderDiff.differentNames: object expected");
+                    message.differentNames[i] = $root.fs.FolderDiff.DifferentNames.fromObject(object.differentNames[i]);
+                }
+            }
             return message;
         };
 
@@ -13478,6 +13549,8 @@ $root.fs = (function() {
                 object.inCurrent = [];
                 object.inRemote = [];
                 object.nameOverlaps = [];
+                object.differentKeys = [];
+                object.differentNames = [];
             }
             if (options.defaults) {
                 if ($util.Long) {
@@ -13518,6 +13591,16 @@ $root.fs = (function() {
                 object.mtime = $root.fs.FolderDiff.TimeStamps.toObject(message.mtime, options);
             if (message.xattrs != null && message.hasOwnProperty("xattrs"))
                 object.xattrs = $root.fs.FolderDiff.XAttrs.toObject(message.xattrs, options);
+            if (message.differentKeys && message.differentKeys.length) {
+                object.differentKeys = [];
+                for (var j = 0; j < message.differentKeys.length; ++j)
+                    object.differentKeys[j] = message.differentKeys[j];
+            }
+            if (message.differentNames && message.differentNames.length) {
+                object.differentNames = [];
+                for (var j = 0; j < message.differentNames.length; ++j)
+                    object.differentNames[j] = $root.fs.FolderDiff.DifferentNames.toObject(message.differentNames[j], options);
+            }
             return object;
         };
 
@@ -14105,6 +14188,235 @@ $root.fs = (function() {
             return XAttrs;
         })();
 
+        FolderDiff.DifferentNames = (function() {
+
+            /**
+             * Properties of a DifferentNames.
+             * @memberof fs.FolderDiff
+             * @interface IDifferentNames
+             * @property {string|null} [localName] DifferentNames localName
+             * @property {string|null} [remoteName] DifferentNames remoteName
+             */
+
+            /**
+             * Constructs a new DifferentNames.
+             * @memberof fs.FolderDiff
+             * @classdesc Represents a DifferentNames.
+             * @implements IDifferentNames
+             * @constructor
+             * @param {fs.FolderDiff.IDifferentNames=} [properties] Properties to set
+             */
+            function DifferentNames(properties) {
+                if (properties)
+                    for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+                        if (properties[keys[i]] != null)
+                            this[keys[i]] = properties[keys[i]];
+            }
+
+            /**
+             * DifferentNames localName.
+             * @member {string} localName
+             * @memberof fs.FolderDiff.DifferentNames
+             * @instance
+             */
+            DifferentNames.prototype.localName = "";
+
+            /**
+             * DifferentNames remoteName.
+             * @member {string} remoteName
+             * @memberof fs.FolderDiff.DifferentNames
+             * @instance
+             */
+            DifferentNames.prototype.remoteName = "";
+
+            /**
+             * Creates a new DifferentNames instance using the specified properties.
+             * @function create
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.IDifferentNames=} [properties] Properties to set
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames instance
+             */
+            DifferentNames.create = function create(properties) {
+                return new DifferentNames(properties);
+            };
+
+            /**
+             * Encodes the specified DifferentNames message. Does not implicitly {@link fs.FolderDiff.DifferentNames.verify|verify} messages.
+             * @function encode
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.IDifferentNames} message DifferentNames message or plain object to encode
+             * @param {$protobuf.Writer} [writer] Writer to encode to
+             * @returns {$protobuf.Writer} Writer
+             */
+            DifferentNames.encode = function encode(message, writer) {
+                if (!writer)
+                    writer = $Writer.create();
+                if (message.localName != null && Object.hasOwnProperty.call(message, "localName"))
+                    writer.uint32(/* id 1, wireType 2 =*/10).string(message.localName);
+                if (message.remoteName != null && Object.hasOwnProperty.call(message, "remoteName"))
+                    writer.uint32(/* id 2, wireType 2 =*/18).string(message.remoteName);
+                return writer;
+            };
+
+            /**
+             * Encodes the specified DifferentNames message, length delimited. Does not implicitly {@link fs.FolderDiff.DifferentNames.verify|verify} messages.
+             * @function encodeDelimited
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.IDifferentNames} message DifferentNames message or plain object to encode
+             * @param {$protobuf.Writer} [writer] Writer to encode to
+             * @returns {$protobuf.Writer} Writer
+             */
+            DifferentNames.encodeDelimited = function encodeDelimited(message, writer) {
+                return this.encode(message, writer).ldelim();
+            };
+
+            /**
+             * Decodes a DifferentNames message from the specified reader or buffer.
+             * @function decode
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+             * @param {number} [length] Message length if known beforehand
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames
+             * @throws {Error} If the payload is not a reader or valid buffer
+             * @throws {$protobuf.util.ProtocolError} If required fields are missing
+             */
+            DifferentNames.decode = function decode(reader, length, error) {
+                if (!(reader instanceof $Reader))
+                    reader = $Reader.create(reader);
+                var end = length === undefined ? reader.len : reader.pos + length, message = new $root.fs.FolderDiff.DifferentNames();
+                while (reader.pos < end) {
+                    var tag = reader.uint32();
+                    if (tag === error)
+                        break;
+                    switch (tag >>> 3) {
+                    case 1: {
+                            message.localName = reader.string();
+                            break;
+                        }
+                    case 2: {
+                            message.remoteName = reader.string();
+                            break;
+                        }
+                    default:
+                        reader.skipType(tag & 7);
+                        break;
+                    }
+                }
+                return message;
+            };
+
+            /**
+             * Decodes a DifferentNames message from the specified reader or buffer, length delimited.
+             * @function decodeDelimited
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames
+             * @throws {Error} If the payload is not a reader or valid buffer
+             * @throws {$protobuf.util.ProtocolError} If required fields are missing
+             */
+            DifferentNames.decodeDelimited = function decodeDelimited(reader) {
+                if (!(reader instanceof $Reader))
+                    reader = new $Reader(reader);
+                return this.decode(reader, reader.uint32());
+            };
+
+            /**
+             * Verifies a DifferentNames message.
+             * @function verify
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {Object.<string,*>} message Plain object to verify
+             * @returns {string|null} `null` if valid, otherwise the reason why it is not
+             */
+            DifferentNames.verify = function verify(message) {
+                if (typeof message !== "object" || message === null)
+                    return "object expected";
+                if (message.localName != null && message.hasOwnProperty("localName"))
+                    if (!$util.isString(message.localName))
+                        return "localName: string expected";
+                if (message.remoteName != null && message.hasOwnProperty("remoteName"))
+                    if (!$util.isString(message.remoteName))
+                        return "remoteName: string expected";
+                return null;
+            };
+
+            /**
+             * Creates a DifferentNames message from a plain object. Also converts values to their respective internal types.
+             * @function fromObject
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {Object.<string,*>} object Plain object
+             * @returns {fs.FolderDiff.DifferentNames} DifferentNames
+             */
+            DifferentNames.fromObject = function fromObject(object) {
+                if (object instanceof $root.fs.FolderDiff.DifferentNames)
+                    return object;
+                var message = new $root.fs.FolderDiff.DifferentNames();
+                if (object.localName != null)
+                    message.localName = String(object.localName);
+                if (object.remoteName != null)
+                    message.remoteName = String(object.remoteName);
+                return message;
+            };
+
+            /**
+             * Creates a plain object from a DifferentNames message. Also converts values to other types if specified.
+             * @function toObject
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {fs.FolderDiff.DifferentNames} message DifferentNames
+             * @param {$protobuf.IConversionOptions} [options] Conversion options
+             * @returns {Object.<string,*>} Plain object
+             */
+            DifferentNames.toObject = function toObject(message, options) {
+                if (!options)
+                    options = {};
+                var object = {};
+                if (options.defaults) {
+                    object.localName = "";
+                    object.remoteName = "";
+                }
+                if (message.localName != null && message.hasOwnProperty("localName"))
+                    object.localName = message.localName;
+                if (message.remoteName != null && message.hasOwnProperty("remoteName"))
+                    object.remoteName = message.remoteName;
+                return object;
+            };
+
+            /**
+             * Converts this DifferentNames to JSON.
+             * @function toJSON
+             * @memberof fs.FolderDiff.DifferentNames
+             * @instance
+             * @returns {Object.<string,*>} JSON object
+             */
+            DifferentNames.prototype.toJSON = function toJSON() {
+                return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+            };
+
+            /**
+             * Gets the default type url for DifferentNames
+             * @function getTypeUrl
+             * @memberof fs.FolderDiff.DifferentNames
+             * @static
+             * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+             * @returns {string} The default type url
+             */
+            DifferentNames.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+                if (typeUrlPrefix === undefined) {
+                    typeUrlPrefix = "type.googleapis.com";
+                }
+                return typeUrlPrefix + "/fs.FolderDiff.DifferentNames";
+            };
+
+            return DifferentNames;
+        })();
+
         return FolderDiff;
     })();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.43.18",
+  "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

@@ -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 {