core-3nweb-client-lib 0.43.12 → 0.43.14

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

@@ -83,6 +83,7 @@ declare namespace web3n.files {
 		notSynced?: true;
 		remoteIsArchived?: true;
 		remoteFolderItemNotFound?: true;
+		overlapsLocalItem?: true;
 	}
 
 	/**
@@ -1304,9 +1305,35 @@ declare namespace web3n.files {
 		 * @param path 
 		 * @param remoteVersion 
 		 */
-		diffCurrentAndRemoteFolderVersions(
-			path: string, remoteVersion?: number
-		): Promise<FolderDiff|undefined>;
+		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
+		 * @param remoteItemName 
+		 * @param remoteVersion of folder. Default is current remote.
+		 */
+		statRemoteItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<Stats>;
+
+		/**
+		 * Lists child folder from remote version of a folder.
+		 * @param path of folder
+		 * @param remoteItemName 
+		 * @param remoteVersion of folder. Default is current remote.
+		 */
+		listRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ListingEntry[]>;
+
+		/**
+		 * Returns child file from remote version of a folder.
+		 * @param path of folder
+		 * @param remoteItemName 
+		 * @param remoteVersion of folder. Default is current remote.
+		 */
+		getRemoteFileItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFile>;
 
 	}
 
@@ -1355,26 +1382,39 @@ declare namespace web3n.files {
 		 * @param path 
 		 * @param opts 
 		 */
-		upload(
-			path: string, opts?: OptionsToUploadLocal
-		): Promise<number|undefined>;
+		upload(path: string, opts?: OptionsToUploadLocal): Promise<number|undefined>;
 
 		/**
 		 * This method is for resolving conflicts on folders.
 		 * It adopts some folder items, and not the whole folder state.
 		 * @param path 
-		 * @param itemName 
+		 * @param remoteItemName 
 		 * @param opts 
 		 */
 		adoptRemoteFolderItem(
-			path: string, itemName: string, opts?: OptionsToAdoptRemoteItem
+			path: string, remoteItemName: string, opts?: OptionsToAdoptRemoteItem
 		): Promise<number>;
 
 	}
 
 	interface OptionsToAdoptRemoteItem {
+		/**
+		 * Folder's local version. If not given, current local version is used.
+		 */
 		localVersion?: number;
+		/**
+		 * Folder's remote version. If not given, current remote version is used.
+		 */
 		remoteVersion?: number;
+		/**
+		 * Flag to force replacement of locally referenced item under the same item name (or new name).
+		 * If not given, and there is an overlapping local, an exception is thrown.
+		 */
+		replaceLocalItem?: boolean;
+		/**
+		 * Name for item when it is added into local folder version.
+		 */
+		newItemName?: string;
 	}
 
 	interface FSEvent {

package/build/core-ipc/fs.d.ts

@@ -41,6 +41,8 @@ export declare namespace fsItem {
 interface OptionsToAdoptRemoteItemMsg {
     localVersion?: Value<number>;
     remoteVersion?: Value<number>;
+    replaceLocalItem?: Value<boolean>;
+    newItemName?: Value<string>;
 }
 export declare function optionsToAdoptRemoteItemToMsg(opts: OptionsToAdoptRemoteItem | undefined): OptionsToAdoptRemoteItemMsg | undefined;
 export declare function optionsToAdoptRemoteItemFromMsg(msg: OptionsToAdoptRemoteItemMsg | undefined): OptionsToAdoptRemoteItem | undefined;

package/build/core-ipc/fs.js

@@ -107,7 +107,10 @@ function makeFSCaller(caller, fsMsg) {
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
                 startDownload: vsDownload.makeCaller(caller, vsPath),
                 adoptRemote: vsAdoptRemote.makeCaller(caller, vsPath),
-                diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.makeCaller(caller, vsPath)
+                diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.makeCaller(caller, vsPath),
+                statRemoteItem: vsStatRemoteItem.makeCaller(caller, vsPath),
+                listRemoteFolderItem: vsListRemoteFolderItem.makeCaller(caller, vsPath),
+                getRemoteFileItem: vsGetRemoteFileItem.makeCaller(caller, vsPath),
             };
             if (fs.writable) {
                 fs.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
@@ -186,6 +189,9 @@ function exposeFSService(fs, expServices) {
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(fs.v.sync.isRemoteVersionOnDisk),
                 startDownload: vsDownload.wrapService(fs.v.sync.startDownload),
                 adoptRemote: vsAdoptRemote.wrapService(fs.v.sync.adoptRemote),
+                statRemoteItem: vsStatRemoteItem.wrapService(fs.v.sync.statRemoteItem),
+                listRemoteFolderItem: vsListRemoteFolderItem.wrapService(fs.v.sync.listRemoteFolderItem),
+                getRemoteFileItem: vsGetRemoteFileItem.wrapService(fs.v.sync.getRemoteFileItem, expServices),
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions)
             };
             if (fs.writable) {
@@ -515,12 +521,20 @@ var readonlySubRoot;
 Object.freeze(readonlySubRoot);
 var listFolder;
 (function (listFolder) {
-    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ListFolderReplyBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ListFolderReplyBody);
+    function packFolderListing(lst) {
+        return replyType.pack({ entries: lst.map(lsEntryToMsg) });
+    }
+    listFolder.packFolderListing = packFolderListing;
+    function unpackFolderListing(buf) {
+        return (0, protobuf_msg_1.fixArray)(replyType.unpack(buf).entries).map(lsEntryFromMsg);
+    }
+    listFolder.unpackFolderListing = unpackFolderListing;
     function wrapService(fn) {
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
             const promise = fn(path)
-                .then(lst => requestType.pack({ entries: lst.map(lsEntryToMsg) }));
+                .then(packFolderListing);
             return { promise };
         };
     }
@@ -529,7 +543,7 @@ var listFolder;
         const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'listFolder');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
-            .then(buf => (0, protobuf_msg_1.fixArray)(requestType.unpack(buf).entries).map(lsEntryFromMsg));
+            .then(unpackFolderListing);
     }
     listFolder.makeCaller = makeCaller;
 })(listFolder || (listFolder = {}));
@@ -1920,7 +1934,9 @@ function optionsToAdoptRemoteItemToMsg(opts) {
     }
     return {
         localVersion: (0, protobuf_msg_1.toOptVal)(opts.localVersion),
-        remoteVersion: (0, protobuf_msg_1.toOptVal)(opts.remoteVersion)
+        remoteVersion: (0, protobuf_msg_1.toOptVal)(opts.remoteVersion),
+        replaceLocalItem: (0, protobuf_msg_1.toOptVal)(opts.replaceLocalItem),
+        newItemName: (0, protobuf_msg_1.toOptVal)(opts.newItemName)
     };
 }
 function optionsToAdoptRemoteItemFromMsg(msg) {
@@ -1929,7 +1945,9 @@ function optionsToAdoptRemoteItemFromMsg(msg) {
     }
     return {
         localVersion: (0, protobuf_msg_1.valOfOptInt)(msg.localVersion),
-        remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion)
+        remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion),
+        replaceLocalItem: (0, protobuf_msg_1.valOfOpt)(msg.replaceLocalItem),
+        newItemName: (0, protobuf_msg_1.valOfOpt)(msg.newItemName)
     };
 }
 var vsAdoptRemoteFolderItem;
@@ -1976,6 +1994,80 @@ var vsAdoptRemote;
     vsAdoptRemote.makeCaller = makeCaller;
 })(vsAdoptRemote || (vsAdoptRemote = {}));
 Object.freeze(vsAdoptRemote);
+const remoteChildReqType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.RemoteChildRequestBody);
+;
+var vsStatRemoteItem;
+(function (vsStatRemoteItem) {
+    function wrapService(fn) {
+        return buf => {
+            const { path, remoteItemName, remoteVersion } = remoteChildReqType.unpack(buf);
+            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOpt)(remoteVersion))
+                .then(file.packStats);
+            return { promise };
+        };
+    }
+    vsStatRemoteItem.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'statRemoteItem');
+        return (path, remoteItemName, remoteVersion) => caller
+            .startPromiseCall(ipcPath, remoteChildReqType.pack({
+            path, remoteItemName, remoteVersion: (0, protobuf_msg_1.toOptVal)(remoteVersion)
+        }))
+            .then(file.unpackStats);
+    }
+    vsStatRemoteItem.makeCaller = makeCaller;
+})(vsStatRemoteItem || (vsStatRemoteItem = {}));
+Object.freeze(vsStatRemoteItem);
+var vsListRemoteFolderItem;
+(function (vsListRemoteFolderItem) {
+    function wrapService(fn) {
+        return buf => {
+            const { path, remoteItemName, remoteVersion } = remoteChildReqType.unpack(buf);
+            const promise = fn(path, remoteItemName, (0, protobuf_msg_1.valOfOpt)(remoteVersion))
+                .then(listFolder.packFolderListing);
+            return { promise };
+        };
+    }
+    vsListRemoteFolderItem.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'listRemoteFolderItem');
+        return (path, remoteItemName, remoteVersion) => caller
+            .startPromiseCall(ipcPath, remoteChildReqType.pack({
+            path, remoteItemName, remoteVersion: (0, protobuf_msg_1.toOptVal)(remoteVersion)
+        }))
+            .then(listFolder.unpackFolderListing);
+    }
+    vsListRemoteFolderItem.makeCaller = makeCaller;
+})(vsListRemoteFolderItem || (vsListRemoteFolderItem = {}));
+Object.freeze(vsListRemoteFolderItem);
+var vsGetRemoteFileItem;
+(function (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))
+                .then(file => {
+                const fileMsg = (0, file_1.exposeFileService)(file, expServices);
+                return file_1.fileMsgType.pack(fileMsg);
+            });
+            return { promise };
+        };
+    }
+    vsGetRemoteFileItem.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getRemoteFileItem');
+        return (path, remoteItemName, remoteVersion) => caller
+            .startPromiseCall(ipcPath, remoteChildReqType.pack({
+            path, remoteItemName, remoteVersion: (0, protobuf_msg_1.toOptVal)(remoteVersion)
+        }))
+            .then(buf => {
+            const fileMsg = file_1.fileMsgType.unpack(buf);
+            return (0, file_1.makeFileCaller)(caller, fileMsg);
+        });
+    }
+    vsGetRemoteFileItem.makeCaller = makeCaller;
+})(vsGetRemoteFileItem || (vsGetRemoteFileItem = {}));
+Object.freeze(vsGetRemoteFileItem);
 var vListVersions;
 (function (vListVersions) {
     function wrapService(fn) {

package/build/lib-client/fs-utils/files.js

@@ -241,6 +241,9 @@ function wrapWritableFSSyncAPI(sImpl) {
         startUpload: sImpl.startUpload.bind(sImpl),
         upload: sImpl.upload.bind(sImpl),
         adoptRemoteFolderItem: sImpl.adoptRemoteFolderItem.bind(sImpl),
+        statRemoteItem: sImpl.statRemoteItem.bind(sImpl),
+        listRemoteFolderItem: sImpl.listRemoteFolderItem.bind(sImpl),
+        getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -299,6 +302,9 @@ function wrapReadonlyFSSyncAPI(sImpl) {
         startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
+        statRemoteItem: sImpl.statRemoteItem.bind(sImpl),
+        listRemoteFolderItem: sImpl.listRemoteFolderItem.bind(sImpl),
+        getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
         diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
     };
     return Object.freeze(w);

package/build/lib-client/xsp-fs/folder-node.d.ts

@@ -88,7 +88,7 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
         version: number;
     }>;
     childExistsInSyncedVersion(childObjId: string): Promise<boolean>;
-    getNodeInfo(name: string, undefOnMissing?: boolean): NodeInfo | undefined;
+    getCurrentNodeInfo(name: string, undefOnMissing?: boolean): NodeInfo | undefined;
     hasChild(childName: string, throwIfMissing?: boolean): boolean;
     getNode<T extends NodeInFS<any>>(type: NodeType | undefined, name: string, undefOnMissing?: boolean): Promise<T | undefined>;
     private getOrMakeChildNodeForInfo;
@@ -157,11 +157,13 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
         createOnRemote: boolean;
     } | undefined>;
     private getNodesRemovedBetweenVersions;
-    adoptRemoteFolderItem(itemName: string, opts: OptionsToAdoptRemoteItem | undefined): Promise<number>;
+    adoptRemoteFolderItem(remoteItemName: string, opts: OptionsToAdoptRemoteItem | undefined): Promise<number>;
+    private getRemoteChildNodeInfo;
     private addRemoteChild;
     private replaceLocalChildWithRemote;
     diffCurrentAndRemote(remoteVersion: number | undefined): Promise<FolderDiff | undefined>;
     private diffWithArchivedRemote;
     private diffWithRemote;
+    getRemoteItemNode<T extends NodeInFS<any>>(remoteItemName: string, remoteVersion: number | undefined): Promise<T>;
 }
 export {};

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

@@ -269,7 +269,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             return false;
         }
     }
-    getNodeInfo(name, undefOnMissing = false) {
+    getCurrentNodeInfo(name, undefOnMissing = false) {
         const fj = this.currentState.nodes[name];
         if (fj) {
             return fj;
@@ -282,10 +282,10 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         }
     }
     hasChild(childName, throwIfMissing = false) {
-        return !!this.getNodeInfo(childName, !throwIfMissing);
+        return !!this.getCurrentNodeInfo(childName, !throwIfMissing);
     }
     async getNode(type, name, undefOnMissing = false) {
-        const childInfo = this.getNodeInfo(name, undefOnMissing);
+        const childInfo = this.getCurrentNodeInfo(name, undefOnMissing);
         if (!childInfo) {
             return;
         }
@@ -302,7 +302,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         }
         return this.getOrMakeChildNodeForInfo(childInfo);
     }
-    async getOrMakeChildNodeForInfo(info) {
+    async getOrMakeChildNodeForInfo(info, fromCurrentNodes = true) {
         const { node, nodePromise } = this.storage.nodes.getNodeOrPromise(info.objId);
         if (node) {
             return node;
@@ -331,7 +331,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             return nodeSet;
         }
         catch (exc) {
-            if (exc.objNotFound) {
+            if (exc.objNotFound && fromCurrentNodes) {
                 await this.fixMissingChildAndThrow(exc, info);
             }
             deferred.reject((0, error_1.errWithCause)(exc, `Failed to instantiate fs node '${this.name}/${info.name}'`));
@@ -471,7 +471,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         }
         return this.doChange(true, async () => {
             // do check for concurrent creation of a node
-            if (this.getNodeInfo(name, true)) {
+            if (this.getCurrentNodeInfo(name, true)) {
                 if (exclusive) {
                     throw (0, file_1.makeFileException)('alreadyExists', name);
                 }
@@ -578,7 +578,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             await this.changeChildName(childName, nameInDst);
         }
         else {
-            const childJSON = this.getNodeInfo(childName);
+            const childJSON = this.getCurrentNodeInfo(childName);
             // we have two transitions here, in this and in dst.
             const moveLabel = getMoveLabel();
             await dst.moveChildIn(nameInDst, childJSON, moveLabel);
@@ -890,7 +890,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         const { removedNodes } = identifyChanges(syncedState.nodes, stateToUpload.nodes);
         return removedNodes;
     }
-    async adoptRemoteFolderItem(itemName, opts) {
+    async adoptRemoteFolderItem(remoteItemName, opts) {
         if (opts === null || opts === void 0 ? void 0 : opts.localVersion) {
             if (this.version !== opts.localVersion) {
                 throw (0, exceptions_1.makeFSSyncException)(this.name, {
@@ -899,6 +899,34 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                 });
             }
         }
+        const remoteChildNode = await this.getRemoteChildNodeInfo(remoteItemName, opts === null || opts === void 0 ? void 0 : opts.remoteVersion);
+        let dstItemName = remoteItemName;
+        if (typeof (opts === null || opts === void 0 ? void 0 : opts.newItemName) === 'string') {
+            const newItemName = opts.newItemName.trim();
+            if (newItemName.length > 0) {
+                dstItemName = newItemName;
+            }
+        }
+        const localNodeWithSameName = this.getCurrentNodeInfo(dstItemName, true);
+        if (!localNodeWithSameName) {
+            return await this.addRemoteChild(remoteChildNode, dstItemName);
+        }
+        else if (localNodeWithSameName.objId === remoteChildNode.objId) {
+            (0, assert_1.assert)(typeOfNode(localNodeWithSameName) === typeOfNode(remoteChildNode));
+            // XXX
+            throw new Error(`Adaptation of changing keys needs implementation`);
+        }
+        else if (opts === null || opts === void 0 ? void 0 : opts.replaceLocalItem) {
+            return await this.replaceLocalChildWithRemote(remoteChildNode);
+        }
+        else {
+            throw (0, exceptions_1.makeFSSyncException)(this.name, {
+                overlapsLocalItem: true,
+                message: `Local item exists under name '${dstItemName}' and option flag is not forcing replacement`
+            });
+        }
+    }
+    async getRemoteChildNodeInfo(remoteChildName, remoteVersion) {
         const { remote } = await this.syncStatus();
         if (!remote) {
             throw (0, exceptions_1.makeFSSyncException)(this.name, {
@@ -906,11 +934,11 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                 message: `No remote versions`
             });
         }
-        if (opts === null || opts === void 0 ? void 0 : opts.remoteVersion) {
-            if (opts.remoteVersion !== remote.latest) {
+        if (remoteVersion) {
+            if (remoteVersion !== remote.latest) {
                 throw (0, exceptions_1.makeFSSyncException)(this.name, {
                     versionMismatch: true,
-                    message: `Unknown remote version ${opts.remoteVersion}`
+                    message: `Unknown remote version ${remoteVersion}`
                 });
             }
         }
@@ -922,30 +950,22 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         const storage = this.syncedStorage();
         const srcOfRemote = await storage.getObjSrcOfRemoteVersion(this.objId, remote.latest);
         const { folderInfo: { nodes: remoteNodes } } = await this.crypto.read(srcOfRemote);
-        const remoteChildNode = remoteNodes[itemName];
-        if (!remoteChildNode) {
+        const remoteChildNode = remoteNodes[remoteChildName];
+        if (remoteChildNode) {
+            return remoteChildNode;
+        }
+        else {
             throw (0, exceptions_1.makeFSSyncException)(this.name, {
                 remoteFolderItemNotFound: true,
-                message: `Item '${itemName}' is not found in remote version`
+                message: `Item '${remoteChildName}' is not found in remote version`
             });
         }
-        const localNodeToRm = this.getNodeInfo(itemName, true);
-        if (!localNodeToRm) {
-            return await this.addRemoteChild(remoteChildNode);
-        }
-        else if (localNodeToRm.objId === remoteChildNode.objId) {
-            (0, assert_1.assert)(typeOfNode(localNodeToRm) === typeOfNode(remoteChildNode));
-            // XXX
-            throw new Error(`Adaptation of changing keys needs implementation`);
-        }
-        else {
-            return await this.replaceLocalChildWithRemote(remoteChildNode);
-        }
     }
-    async addRemoteChild(remoteChildNode) {
+    async addRemoteChild(remoteChildNode, childName) {
         let newVersion;
         await this.doTransition(async (state, version) => {
             newVersion = version;
+            remoteChildNode.name = childName;
             state.nodes[remoteChildNode.name] = remoteChildNode;
             const event = {
                 type: 'entry-addition',
@@ -1052,6 +1072,10 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             xattrs: diffXAttrs(this.xattrs, xattrs)
         };
     }
+    async getRemoteItemNode(remoteItemName, remoteVersion) {
+        const remoteChildNodeInfo = await this.getRemoteChildNodeInfo(remoteItemName, remoteVersion);
+        return await this.getOrMakeChildNodeForInfo(remoteChildNodeInfo, false);
+    }
 }
 exports.FolderNode = FolderNode;
 Object.freeze(FolderNode.prototype);

package/build/lib-client/xsp-fs/fs.d.ts

@@ -177,5 +177,8 @@ declare class S implements WritableFSSyncAPI {
     private getFolderNode;
     diffCurrentAndRemoteFolderVersions(path: string, remoteVersion?: number): Promise<FolderDiff | undefined>;
     adoptRemoteFolderItem(path: string, itemName: string, opts?: OptionsToAdoptRemoteItem): Promise<number>;
+    statRemoteItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<Stats>;
+    listRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ListingEntry[]>;
+    getRemoteFileItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFile>;
 }
 export {};

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

@@ -682,7 +682,7 @@ async function recursiveIdAndPathList(folder, path, maxDepth, depth = 0) {
     for (const item of lst) {
         const childPath = `${path}/${item.name}`;
         if (item.isFile || item.isLink) {
-            const { objId } = folder.getNodeInfo(item.name);
+            const { objId } = folder.getCurrentNodeInfo(item.name);
             idAndPaths.push([objId, childPath, depth + 1]);
         }
         else if (item.isFolder) {
@@ -810,6 +810,31 @@ class S {
             throw (0, common_1.setPathInExc)(exc, path);
         }
     }
+    async statRemoteItem(path, remoteItemName, remoteVersion) {
+        const folderNode = await this.getFolderNode(path);
+        const remoteChild = await folderNode.getRemoteItemNode(remoteItemName, remoteVersion);
+        return await remoteChild.getStats();
+    }
+    async listRemoteFolderItem(path, remoteItemName, remoteVersion) {
+        const folderNode = await this.getFolderNode(path);
+        const remoteChild = await folderNode.getRemoteItemNode(remoteItemName, remoteVersion);
+        if (remoteChild.type === 'folder') {
+            return remoteChild.list().lst;
+        }
+        else {
+            throw (0, file_1.makeFileException)('notDirectory', `${path}/${remoteItemName}`);
+        }
+    }
+    async getRemoteFileItem(path, remoteItemName, remoteVersion) {
+        const folderNode = await this.getFolderNode(path);
+        const remoteChild = await folderNode.getRemoteItemNode(remoteItemName, remoteVersion);
+        if (remoteChild.type === 'file') {
+            return (0, files_1.wrapReadonlyFile)(file_2.FileObject.makeExisting(remoteChild, false));
+        }
+        else {
+            throw (0, file_1.makeFileException)('notFile', `${path}/${remoteItemName}`);
+        }
+    }
 }
 Object.freeze(S.prototype);
 Object.freeze(S);

package/build/protos/asmail.proto.js

@@ -33087,6 +33087,263 @@ $root.fs = (function() {
         return FolderDiff;
     })();
 
+    fs.RemoteChildRequestBody = (function() {
+
+        /**
+         * Properties of a RemoteChildRequestBody.
+         * @memberof fs
+         * @interface IRemoteChildRequestBody
+         * @property {string|null} [path] RemoteChildRequestBody path
+         * @property {string|null} [remoteItemName] RemoteChildRequestBody remoteItemName
+         * @property {common.IUInt64Value|null} [remoteVersion] RemoteChildRequestBody remoteVersion
+         */
+
+        /**
+         * Constructs a new RemoteChildRequestBody.
+         * @memberof fs
+         * @classdesc Represents a RemoteChildRequestBody.
+         * @implements IRemoteChildRequestBody
+         * @constructor
+         * @param {fs.IRemoteChildRequestBody=} [properties] Properties to set
+         */
+        function RemoteChildRequestBody(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]];
+        }
+
+        /**
+         * RemoteChildRequestBody path.
+         * @member {string} path
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         */
+        RemoteChildRequestBody.prototype.path = "";
+
+        /**
+         * RemoteChildRequestBody remoteItemName.
+         * @member {string} remoteItemName
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         */
+        RemoteChildRequestBody.prototype.remoteItemName = "";
+
+        /**
+         * RemoteChildRequestBody remoteVersion.
+         * @member {common.IUInt64Value|null|undefined} remoteVersion
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         */
+        RemoteChildRequestBody.prototype.remoteVersion = null;
+
+        /**
+         * Creates a new RemoteChildRequestBody instance using the specified properties.
+         * @function create
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.IRemoteChildRequestBody=} [properties] Properties to set
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody instance
+         */
+        RemoteChildRequestBody.create = function create(properties) {
+            return new RemoteChildRequestBody(properties);
+        };
+
+        /**
+         * Encodes the specified RemoteChildRequestBody message. Does not implicitly {@link fs.RemoteChildRequestBody.verify|verify} messages.
+         * @function encode
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.IRemoteChildRequestBody} message RemoteChildRequestBody message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        RemoteChildRequestBody.encode = function encode(message, writer) {
+            if (!writer)
+                writer = $Writer.create();
+            if (message.path != null && Object.hasOwnProperty.call(message, "path"))
+                writer.uint32(/* id 1, wireType 2 =*/10).string(message.path);
+            if (message.remoteItemName != null && Object.hasOwnProperty.call(message, "remoteItemName"))
+                writer.uint32(/* id 2, wireType 2 =*/18).string(message.remoteItemName);
+            if (message.remoteVersion != null && Object.hasOwnProperty.call(message, "remoteVersion"))
+                $root.common.UInt64Value.encode(message.remoteVersion, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+            return writer;
+        };
+
+        /**
+         * Encodes the specified RemoteChildRequestBody message, length delimited. Does not implicitly {@link fs.RemoteChildRequestBody.verify|verify} messages.
+         * @function encodeDelimited
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.IRemoteChildRequestBody} message RemoteChildRequestBody message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        RemoteChildRequestBody.encodeDelimited = function encodeDelimited(message, writer) {
+            return this.encode(message, writer).ldelim();
+        };
+
+        /**
+         * Decodes a RemoteChildRequestBody message from the specified reader or buffer.
+         * @function decode
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @param {number} [length] Message length if known beforehand
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        RemoteChildRequestBody.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.RemoteChildRequestBody();
+            while (reader.pos < end) {
+                var tag = reader.uint32();
+                if (tag === error)
+                    break;
+                switch (tag >>> 3) {
+                case 1: {
+                        message.path = reader.string();
+                        break;
+                    }
+                case 2: {
+                        message.remoteItemName = reader.string();
+                        break;
+                    }
+                case 3: {
+                        message.remoteVersion = $root.common.UInt64Value.decode(reader, reader.uint32());
+                        break;
+                    }
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+                }
+            }
+            return message;
+        };
+
+        /**
+         * Decodes a RemoteChildRequestBody message from the specified reader or buffer, length delimited.
+         * @function decodeDelimited
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        RemoteChildRequestBody.decodeDelimited = function decodeDelimited(reader) {
+            if (!(reader instanceof $Reader))
+                reader = new $Reader(reader);
+            return this.decode(reader, reader.uint32());
+        };
+
+        /**
+         * Verifies a RemoteChildRequestBody message.
+         * @function verify
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {Object.<string,*>} message Plain object to verify
+         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+         */
+        RemoteChildRequestBody.verify = function verify(message) {
+            if (typeof message !== "object" || message === null)
+                return "object expected";
+            if (message.path != null && message.hasOwnProperty("path"))
+                if (!$util.isString(message.path))
+                    return "path: string expected";
+            if (message.remoteItemName != null && message.hasOwnProperty("remoteItemName"))
+                if (!$util.isString(message.remoteItemName))
+                    return "remoteItemName: string expected";
+            if (message.remoteVersion != null && message.hasOwnProperty("remoteVersion")) {
+                var error = $root.common.UInt64Value.verify(message.remoteVersion);
+                if (error)
+                    return "remoteVersion." + error;
+            }
+            return null;
+        };
+
+        /**
+         * Creates a RemoteChildRequestBody message from a plain object. Also converts values to their respective internal types.
+         * @function fromObject
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {Object.<string,*>} object Plain object
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody
+         */
+        RemoteChildRequestBody.fromObject = function fromObject(object) {
+            if (object instanceof $root.fs.RemoteChildRequestBody)
+                return object;
+            var message = new $root.fs.RemoteChildRequestBody();
+            if (object.path != null)
+                message.path = String(object.path);
+            if (object.remoteItemName != null)
+                message.remoteItemName = String(object.remoteItemName);
+            if (object.remoteVersion != null) {
+                if (typeof object.remoteVersion !== "object")
+                    throw TypeError(".fs.RemoteChildRequestBody.remoteVersion: object expected");
+                message.remoteVersion = $root.common.UInt64Value.fromObject(object.remoteVersion);
+            }
+            return message;
+        };
+
+        /**
+         * Creates a plain object from a RemoteChildRequestBody message. Also converts values to other types if specified.
+         * @function toObject
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.RemoteChildRequestBody} message RemoteChildRequestBody
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
+         * @returns {Object.<string,*>} Plain object
+         */
+        RemoteChildRequestBody.toObject = function toObject(message, options) {
+            if (!options)
+                options = {};
+            var object = {};
+            if (options.defaults) {
+                object.path = "";
+                object.remoteItemName = "";
+                object.remoteVersion = null;
+            }
+            if (message.path != null && message.hasOwnProperty("path"))
+                object.path = message.path;
+            if (message.remoteItemName != null && message.hasOwnProperty("remoteItemName"))
+                object.remoteItemName = message.remoteItemName;
+            if (message.remoteVersion != null && message.hasOwnProperty("remoteVersion"))
+                object.remoteVersion = $root.common.UInt64Value.toObject(message.remoteVersion, options);
+            return object;
+        };
+
+        /**
+         * Converts this RemoteChildRequestBody to JSON.
+         * @function toJSON
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         * @returns {Object.<string,*>} JSON object
+         */
+        RemoteChildRequestBody.prototype.toJSON = function toJSON() {
+            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+        };
+
+        /**
+         * Gets the default type url for RemoteChildRequestBody
+         * @function getTypeUrl
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns {string} The default type url
+         */
+        RemoteChildRequestBody.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            if (typeUrlPrefix === undefined) {
+                typeUrlPrefix = "type.googleapis.com";
+            }
+            return typeUrlPrefix + "/fs.RemoteChildRequestBody";
+        };
+
+        return RemoteChildRequestBody;
+    })();
+
     fs.FSSyncUploadRequestBody = (function() {
 
         /**
@@ -33583,6 +33840,8 @@ $root.fs = (function() {
              * @interface IOptions
              * @property {common.IUInt64Value|null} [localVersion] Options localVersion
              * @property {common.IUInt64Value|null} [uploadVersion] Options uploadVersion
+             * @property {common.IBooleanValue|null} [replaceLocalItem] Options replaceLocalItem
+             * @property {common.IStringValue|null} [newItemName] Options newItemName
              */
 
             /**
@@ -33616,6 +33875,22 @@ $root.fs = (function() {
              */
             Options.prototype.uploadVersion = null;
 
+            /**
+             * Options replaceLocalItem.
+             * @member {common.IBooleanValue|null|undefined} replaceLocalItem
+             * @memberof fs.AdoptRemoteFolderItemRequestBody.Options
+             * @instance
+             */
+            Options.prototype.replaceLocalItem = null;
+
+            /**
+             * Options newItemName.
+             * @member {common.IStringValue|null|undefined} newItemName
+             * @memberof fs.AdoptRemoteFolderItemRequestBody.Options
+             * @instance
+             */
+            Options.prototype.newItemName = null;
+
             /**
              * Creates a new Options instance using the specified properties.
              * @function create
@@ -33644,6 +33919,10 @@ $root.fs = (function() {
                     $root.common.UInt64Value.encode(message.localVersion, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
                 if (message.uploadVersion != null && Object.hasOwnProperty.call(message, "uploadVersion"))
                     $root.common.UInt64Value.encode(message.uploadVersion, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
+                if (message.replaceLocalItem != null && Object.hasOwnProperty.call(message, "replaceLocalItem"))
+                    $root.common.BooleanValue.encode(message.replaceLocalItem, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+                if (message.newItemName != null && Object.hasOwnProperty.call(message, "newItemName"))
+                    $root.common.StringValue.encode(message.newItemName, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
                 return writer;
             };
 
@@ -33688,6 +33967,14 @@ $root.fs = (function() {
                             message.uploadVersion = $root.common.UInt64Value.decode(reader, reader.uint32());
                             break;
                         }
+                    case 3: {
+                            message.replaceLocalItem = $root.common.BooleanValue.decode(reader, reader.uint32());
+                            break;
+                        }
+                    case 4: {
+                            message.newItemName = $root.common.StringValue.decode(reader, reader.uint32());
+                            break;
+                        }
                     default:
                         reader.skipType(tag & 7);
                         break;
@@ -33733,6 +34020,16 @@ $root.fs = (function() {
                     if (error)
                         return "uploadVersion." + error;
                 }
+                if (message.replaceLocalItem != null && message.hasOwnProperty("replaceLocalItem")) {
+                    var error = $root.common.BooleanValue.verify(message.replaceLocalItem);
+                    if (error)
+                        return "replaceLocalItem." + error;
+                }
+                if (message.newItemName != null && message.hasOwnProperty("newItemName")) {
+                    var error = $root.common.StringValue.verify(message.newItemName);
+                    if (error)
+                        return "newItemName." + error;
+                }
                 return null;
             };
 
@@ -33758,6 +34055,16 @@ $root.fs = (function() {
                         throw TypeError(".fs.AdoptRemoteFolderItemRequestBody.Options.uploadVersion: object expected");
                     message.uploadVersion = $root.common.UInt64Value.fromObject(object.uploadVersion);
                 }
+                if (object.replaceLocalItem != null) {
+                    if (typeof object.replaceLocalItem !== "object")
+                        throw TypeError(".fs.AdoptRemoteFolderItemRequestBody.Options.replaceLocalItem: object expected");
+                    message.replaceLocalItem = $root.common.BooleanValue.fromObject(object.replaceLocalItem);
+                }
+                if (object.newItemName != null) {
+                    if (typeof object.newItemName !== "object")
+                        throw TypeError(".fs.AdoptRemoteFolderItemRequestBody.Options.newItemName: object expected");
+                    message.newItemName = $root.common.StringValue.fromObject(object.newItemName);
+                }
                 return message;
             };
 
@@ -33777,11 +34084,17 @@ $root.fs = (function() {
                 if (options.defaults) {
                     object.localVersion = null;
                     object.uploadVersion = null;
+                    object.replaceLocalItem = null;
+                    object.newItemName = null;
                 }
                 if (message.localVersion != null && message.hasOwnProperty("localVersion"))
                     object.localVersion = $root.common.UInt64Value.toObject(message.localVersion, options);
                 if (message.uploadVersion != null && message.hasOwnProperty("uploadVersion"))
                     object.uploadVersion = $root.common.UInt64Value.toObject(message.uploadVersion, options);
+                if (message.replaceLocalItem != null && message.hasOwnProperty("replaceLocalItem"))
+                    object.replaceLocalItem = $root.common.BooleanValue.toObject(message.replaceLocalItem, options);
+                if (message.newItemName != null && message.hasOwnProperty("newItemName"))
+                    object.newItemName = $root.common.StringValue.toObject(message.newItemName, options);
                 return object;
             };
 

package/build/protos/fs.proto.js

@@ -14108,6 +14108,263 @@ $root.fs = (function() {
         return FolderDiff;
     })();
 
+    fs.RemoteChildRequestBody = (function() {
+
+        /**
+         * Properties of a RemoteChildRequestBody.
+         * @memberof fs
+         * @interface IRemoteChildRequestBody
+         * @property {string|null} [path] RemoteChildRequestBody path
+         * @property {string|null} [remoteItemName] RemoteChildRequestBody remoteItemName
+         * @property {common.IUInt64Value|null} [remoteVersion] RemoteChildRequestBody remoteVersion
+         */
+
+        /**
+         * Constructs a new RemoteChildRequestBody.
+         * @memberof fs
+         * @classdesc Represents a RemoteChildRequestBody.
+         * @implements IRemoteChildRequestBody
+         * @constructor
+         * @param {fs.IRemoteChildRequestBody=} [properties] Properties to set
+         */
+        function RemoteChildRequestBody(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]];
+        }
+
+        /**
+         * RemoteChildRequestBody path.
+         * @member {string} path
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         */
+        RemoteChildRequestBody.prototype.path = "";
+
+        /**
+         * RemoteChildRequestBody remoteItemName.
+         * @member {string} remoteItemName
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         */
+        RemoteChildRequestBody.prototype.remoteItemName = "";
+
+        /**
+         * RemoteChildRequestBody remoteVersion.
+         * @member {common.IUInt64Value|null|undefined} remoteVersion
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         */
+        RemoteChildRequestBody.prototype.remoteVersion = null;
+
+        /**
+         * Creates a new RemoteChildRequestBody instance using the specified properties.
+         * @function create
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.IRemoteChildRequestBody=} [properties] Properties to set
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody instance
+         */
+        RemoteChildRequestBody.create = function create(properties) {
+            return new RemoteChildRequestBody(properties);
+        };
+
+        /**
+         * Encodes the specified RemoteChildRequestBody message. Does not implicitly {@link fs.RemoteChildRequestBody.verify|verify} messages.
+         * @function encode
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.IRemoteChildRequestBody} message RemoteChildRequestBody message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        RemoteChildRequestBody.encode = function encode(message, writer) {
+            if (!writer)
+                writer = $Writer.create();
+            if (message.path != null && Object.hasOwnProperty.call(message, "path"))
+                writer.uint32(/* id 1, wireType 2 =*/10).string(message.path);
+            if (message.remoteItemName != null && Object.hasOwnProperty.call(message, "remoteItemName"))
+                writer.uint32(/* id 2, wireType 2 =*/18).string(message.remoteItemName);
+            if (message.remoteVersion != null && Object.hasOwnProperty.call(message, "remoteVersion"))
+                $root.common.UInt64Value.encode(message.remoteVersion, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+            return writer;
+        };
+
+        /**
+         * Encodes the specified RemoteChildRequestBody message, length delimited. Does not implicitly {@link fs.RemoteChildRequestBody.verify|verify} messages.
+         * @function encodeDelimited
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.IRemoteChildRequestBody} message RemoteChildRequestBody message or plain object to encode
+         * @param {$protobuf.Writer} [writer] Writer to encode to
+         * @returns {$protobuf.Writer} Writer
+         */
+        RemoteChildRequestBody.encodeDelimited = function encodeDelimited(message, writer) {
+            return this.encode(message, writer).ldelim();
+        };
+
+        /**
+         * Decodes a RemoteChildRequestBody message from the specified reader or buffer.
+         * @function decode
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @param {number} [length] Message length if known beforehand
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        RemoteChildRequestBody.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.RemoteChildRequestBody();
+            while (reader.pos < end) {
+                var tag = reader.uint32();
+                if (tag === error)
+                    break;
+                switch (tag >>> 3) {
+                case 1: {
+                        message.path = reader.string();
+                        break;
+                    }
+                case 2: {
+                        message.remoteItemName = reader.string();
+                        break;
+                    }
+                case 3: {
+                        message.remoteVersion = $root.common.UInt64Value.decode(reader, reader.uint32());
+                        break;
+                    }
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+                }
+            }
+            return message;
+        };
+
+        /**
+         * Decodes a RemoteChildRequestBody message from the specified reader or buffer, length delimited.
+         * @function decodeDelimited
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        RemoteChildRequestBody.decodeDelimited = function decodeDelimited(reader) {
+            if (!(reader instanceof $Reader))
+                reader = new $Reader(reader);
+            return this.decode(reader, reader.uint32());
+        };
+
+        /**
+         * Verifies a RemoteChildRequestBody message.
+         * @function verify
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {Object.<string,*>} message Plain object to verify
+         * @returns {string|null} `null` if valid, otherwise the reason why it is not
+         */
+        RemoteChildRequestBody.verify = function verify(message) {
+            if (typeof message !== "object" || message === null)
+                return "object expected";
+            if (message.path != null && message.hasOwnProperty("path"))
+                if (!$util.isString(message.path))
+                    return "path: string expected";
+            if (message.remoteItemName != null && message.hasOwnProperty("remoteItemName"))
+                if (!$util.isString(message.remoteItemName))
+                    return "remoteItemName: string expected";
+            if (message.remoteVersion != null && message.hasOwnProperty("remoteVersion")) {
+                var error = $root.common.UInt64Value.verify(message.remoteVersion);
+                if (error)
+                    return "remoteVersion." + error;
+            }
+            return null;
+        };
+
+        /**
+         * Creates a RemoteChildRequestBody message from a plain object. Also converts values to their respective internal types.
+         * @function fromObject
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {Object.<string,*>} object Plain object
+         * @returns {fs.RemoteChildRequestBody} RemoteChildRequestBody
+         */
+        RemoteChildRequestBody.fromObject = function fromObject(object) {
+            if (object instanceof $root.fs.RemoteChildRequestBody)
+                return object;
+            var message = new $root.fs.RemoteChildRequestBody();
+            if (object.path != null)
+                message.path = String(object.path);
+            if (object.remoteItemName != null)
+                message.remoteItemName = String(object.remoteItemName);
+            if (object.remoteVersion != null) {
+                if (typeof object.remoteVersion !== "object")
+                    throw TypeError(".fs.RemoteChildRequestBody.remoteVersion: object expected");
+                message.remoteVersion = $root.common.UInt64Value.fromObject(object.remoteVersion);
+            }
+            return message;
+        };
+
+        /**
+         * Creates a plain object from a RemoteChildRequestBody message. Also converts values to other types if specified.
+         * @function toObject
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {fs.RemoteChildRequestBody} message RemoteChildRequestBody
+         * @param {$protobuf.IConversionOptions} [options] Conversion options
+         * @returns {Object.<string,*>} Plain object
+         */
+        RemoteChildRequestBody.toObject = function toObject(message, options) {
+            if (!options)
+                options = {};
+            var object = {};
+            if (options.defaults) {
+                object.path = "";
+                object.remoteItemName = "";
+                object.remoteVersion = null;
+            }
+            if (message.path != null && message.hasOwnProperty("path"))
+                object.path = message.path;
+            if (message.remoteItemName != null && message.hasOwnProperty("remoteItemName"))
+                object.remoteItemName = message.remoteItemName;
+            if (message.remoteVersion != null && message.hasOwnProperty("remoteVersion"))
+                object.remoteVersion = $root.common.UInt64Value.toObject(message.remoteVersion, options);
+            return object;
+        };
+
+        /**
+         * Converts this RemoteChildRequestBody to JSON.
+         * @function toJSON
+         * @memberof fs.RemoteChildRequestBody
+         * @instance
+         * @returns {Object.<string,*>} JSON object
+         */
+        RemoteChildRequestBody.prototype.toJSON = function toJSON() {
+            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
+        };
+
+        /**
+         * Gets the default type url for RemoteChildRequestBody
+         * @function getTypeUrl
+         * @memberof fs.RemoteChildRequestBody
+         * @static
+         * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns {string} The default type url
+         */
+        RemoteChildRequestBody.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            if (typeUrlPrefix === undefined) {
+                typeUrlPrefix = "type.googleapis.com";
+            }
+            return typeUrlPrefix + "/fs.RemoteChildRequestBody";
+        };
+
+        return RemoteChildRequestBody;
+    })();
+
     fs.FSSyncUploadRequestBody = (function() {
 
         /**
@@ -14604,6 +14861,8 @@ $root.fs = (function() {
              * @interface IOptions
              * @property {common.IUInt64Value|null} [localVersion] Options localVersion
              * @property {common.IUInt64Value|null} [uploadVersion] Options uploadVersion
+             * @property {common.IBooleanValue|null} [replaceLocalItem] Options replaceLocalItem
+             * @property {common.IStringValue|null} [newItemName] Options newItemName
              */
 
             /**
@@ -14637,6 +14896,22 @@ $root.fs = (function() {
              */
             Options.prototype.uploadVersion = null;
 
+            /**
+             * Options replaceLocalItem.
+             * @member {common.IBooleanValue|null|undefined} replaceLocalItem
+             * @memberof fs.AdoptRemoteFolderItemRequestBody.Options
+             * @instance
+             */
+            Options.prototype.replaceLocalItem = null;
+
+            /**
+             * Options newItemName.
+             * @member {common.IStringValue|null|undefined} newItemName
+             * @memberof fs.AdoptRemoteFolderItemRequestBody.Options
+             * @instance
+             */
+            Options.prototype.newItemName = null;
+
             /**
              * Creates a new Options instance using the specified properties.
              * @function create
@@ -14665,6 +14940,10 @@ $root.fs = (function() {
                     $root.common.UInt64Value.encode(message.localVersion, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim();
                 if (message.uploadVersion != null && Object.hasOwnProperty.call(message, "uploadVersion"))
                     $root.common.UInt64Value.encode(message.uploadVersion, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
+                if (message.replaceLocalItem != null && Object.hasOwnProperty.call(message, "replaceLocalItem"))
+                    $root.common.BooleanValue.encode(message.replaceLocalItem, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim();
+                if (message.newItemName != null && Object.hasOwnProperty.call(message, "newItemName"))
+                    $root.common.StringValue.encode(message.newItemName, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
                 return writer;
             };
 
@@ -14709,6 +14988,14 @@ $root.fs = (function() {
                             message.uploadVersion = $root.common.UInt64Value.decode(reader, reader.uint32());
                             break;
                         }
+                    case 3: {
+                            message.replaceLocalItem = $root.common.BooleanValue.decode(reader, reader.uint32());
+                            break;
+                        }
+                    case 4: {
+                            message.newItemName = $root.common.StringValue.decode(reader, reader.uint32());
+                            break;
+                        }
                     default:
                         reader.skipType(tag & 7);
                         break;
@@ -14754,6 +15041,16 @@ $root.fs = (function() {
                     if (error)
                         return "uploadVersion." + error;
                 }
+                if (message.replaceLocalItem != null && message.hasOwnProperty("replaceLocalItem")) {
+                    var error = $root.common.BooleanValue.verify(message.replaceLocalItem);
+                    if (error)
+                        return "replaceLocalItem." + error;
+                }
+                if (message.newItemName != null && message.hasOwnProperty("newItemName")) {
+                    var error = $root.common.StringValue.verify(message.newItemName);
+                    if (error)
+                        return "newItemName." + error;
+                }
                 return null;
             };
 
@@ -14779,6 +15076,16 @@ $root.fs = (function() {
                         throw TypeError(".fs.AdoptRemoteFolderItemRequestBody.Options.uploadVersion: object expected");
                     message.uploadVersion = $root.common.UInt64Value.fromObject(object.uploadVersion);
                 }
+                if (object.replaceLocalItem != null) {
+                    if (typeof object.replaceLocalItem !== "object")
+                        throw TypeError(".fs.AdoptRemoteFolderItemRequestBody.Options.replaceLocalItem: object expected");
+                    message.replaceLocalItem = $root.common.BooleanValue.fromObject(object.replaceLocalItem);
+                }
+                if (object.newItemName != null) {
+                    if (typeof object.newItemName !== "object")
+                        throw TypeError(".fs.AdoptRemoteFolderItemRequestBody.Options.newItemName: object expected");
+                    message.newItemName = $root.common.StringValue.fromObject(object.newItemName);
+                }
                 return message;
             };
 
@@ -14798,11 +15105,17 @@ $root.fs = (function() {
                 if (options.defaults) {
                     object.localVersion = null;
                     object.uploadVersion = null;
+                    object.replaceLocalItem = null;
+                    object.newItemName = null;
                 }
                 if (message.localVersion != null && message.hasOwnProperty("localVersion"))
                     object.localVersion = $root.common.UInt64Value.toObject(message.localVersion, options);
                 if (message.uploadVersion != null && message.hasOwnProperty("uploadVersion"))
                     object.uploadVersion = $root.common.UInt64Value.toObject(message.uploadVersion, options);
+                if (message.replaceLocalItem != null && message.hasOwnProperty("replaceLocalItem"))
+                    object.replaceLocalItem = $root.common.BooleanValue.toObject(message.replaceLocalItem, options);
+                if (message.newItemName != null && message.hasOwnProperty("newItemName"))
+                    object.newItemName = $root.common.StringValue.toObject(message.newItemName, options);
                 return object;
             };
 

package/package.json

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

package/protos/fs.proto

@@ -512,6 +512,24 @@ message FolderDiff {
 	XAttrs xattrs = 8;
 }
 
+message RemoteChildRequestBody {
+	string path = 1;
+	string remote_item_name = 2;
+	common.UInt64Value remote_version = 3;
+}
+
+// --- ReadonlyFSSyncAPI.statRemoteItem ---
+// Request body is RemoteChildRequestBody
+// Reply body is file.StatsMsg
+
+// --- ReadonlyFSSyncAPI.listRemoteFolderItem ---
+// Request body is RemoteChildRequestBody
+// Reply body is ListFolderReplyBody
+
+// --- ReadonlyFSSyncAPI.getRemoteFileItem ---
+// Request body is RemoteChildRequestBody
+// Reply body is file.File
+
 
 // ==== WritableFSSyncAPI referable object ====
 
@@ -531,6 +549,8 @@ message AdoptRemoteFolderItemRequestBody {
 	message Options {
 		common.UInt64Value local_version = 1;
 		common.UInt64Value upload_version = 2;
+		common.BooleanValue replace_local_item = 3;
+		common.StringValue new_item_name = 4;
 	}
 	string path = 1;
 	string item_name = 2;