core-3nweb-client-lib 0.27.3 → 0.27.5

package/build/ipc-via-protobuf/fs.js

@@ -76,7 +76,7 @@ function makeFSCaller(caller, fsMsg) {
         fs.writeTxtFile = writeTxtFile.makeCaller(caller, objPath);
     }
     if (fsMsg.isVersioned) {
-        const vPath = objPath.concat('v');
+        const vPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'v');
         fs.v = {
             getByteSource: vGetByteSource.makeCaller(caller, vPath),
             getXAttr: vGetXAttr.makeCaller(caller, vPath),
@@ -96,7 +96,7 @@ function makeFSCaller(caller, fsMsg) {
             fs.v.archiveCurrent = vArchiveCurrent.makeCaller(caller, vPath);
         }
         if (fsMsg.isSynced) {
-            const vsPath = objPath.concat('v', 'sync');
+            const vsPath = (0, protobuf_msg_1.methodPathFor)(vPath, 'sync');
             fs.v.sync = {
                 status: vsStatus.makeCaller(caller, vsPath),
                 updateStatusInfo: vsUpdateStatusInfo.makeCaller(caller, vsPath),
@@ -225,15 +225,15 @@ var checkPresence;
             .then(buf => protobuf_msg_1.boolValType.unpack(buf).value);
     }
     function makeFileCaller(caller, objPath) {
-        return makeCaller(caller, objPath.concat('checkFilePresence'));
+        return makeCaller(caller, (0, protobuf_msg_1.methodPathFor)(objPath, 'checkFilePresence'));
     }
     checkPresence.makeFileCaller = makeFileCaller;
     function makeFolderCaller(caller, objPath) {
-        return makeCaller(caller, objPath.concat('checkFolderPresence'));
+        return makeCaller(caller, (0, protobuf_msg_1.methodPathFor)(objPath, 'checkFolderPresence'));
     }
     checkPresence.makeFolderCaller = makeFolderCaller;
     function makeLinkCaller(caller, objPath) {
-        return makeCaller(caller, objPath.concat('checkLinkPresence'));
+        return makeCaller(caller, (0, protobuf_msg_1.methodPathFor)(objPath, 'checkLinkPresence'));
     }
     checkPresence.makeLinkCaller = makeLinkCaller;
 })(checkPresence || (checkPresence = {}));
@@ -251,7 +251,7 @@ var stat;
     }
     stat.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('stat');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'stat');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(file_1.unpackStats);
@@ -261,10 +261,10 @@ var stat;
 Object.freeze(stat);
 var getXAttr;
 (function (getXAttr) {
-    getXAttr.requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.GetXAttrRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.GetXAttrRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, xaName } = getXAttr.requestType.unpack(buf);
+            const { path, xaName } = requestType.unpack(buf);
             const promise = fn(path, xaName)
                 .then(file_1.packXAttrValue);
             return { promise };
@@ -272,9 +272,9 @@ var getXAttr;
     }
     getXAttr.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getXAttr');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getXAttr');
         return (path, xaName) => caller
-            .startPromiseCall(ipcPath, getXAttr.requestType.pack({ path, xaName }))
+            .startPromiseCall(ipcPath, requestType.pack({ path, xaName }))
             .then(file_1.unpackXAttrValue);
     }
     getXAttr.makeCaller = makeCaller;
@@ -292,7 +292,7 @@ var listXAttrs;
     }
     listXAttrs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('listXAttrs');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'listXAttrs');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => (0, protobuf_msg_1.fixArray)(protobuf_msg_1.strArrValType.unpack(buf).values));
@@ -371,7 +371,7 @@ var readLink;
     }
     readLink.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readLink');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readLink');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
@@ -551,12 +551,12 @@ var watch;
         };
     }
     function makeFolderCaller(caller, objPath) {
-        const ipcPath = objPath.concat('watchFolder');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'watchFolder');
         return makeCaller(caller, ipcPath, unpackFSEvent);
     }
     watch.makeFolderCaller = makeFolderCaller;
     function makeFileCaller(caller, objPath) {
-        const ipcPath = objPath.concat('watchFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'watchFile');
         return makeCaller(caller, ipcPath, file_1.unpackFileEvent);
     }
     watch.makeFileCaller = makeFileCaller;
@@ -576,7 +576,7 @@ var watchTree;
     }
     watchTree.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('watchTree');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'watchTree');
         return (path, depth, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(ipcPath, requestType.pack({ path, depth: (0, protobuf_msg_1.toOptVal)(depth) }), s);
@@ -599,7 +599,7 @@ var close;
     }
     close.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('close');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'close');
         return () => caller
             .startPromiseCall(path, undefined);
     }
@@ -621,7 +621,7 @@ var readonlySubRoot;
     }
     readonlySubRoot.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readonlySubRoot');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readonlySubRoot');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
@@ -645,7 +645,7 @@ var listFolder;
     }
     listFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('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));
@@ -665,7 +665,7 @@ var readJSONFile;
     }
     readJSONFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readJSONFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readJSONFile');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(file_1.unpackJSON);
@@ -685,7 +685,7 @@ var readTxtFile;
     }
     readTxtFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readTxtFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readTxtFile');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => (buf ? (0, protobuf_msg_1.decodeFromUtf8)(buf) : ''));
@@ -695,10 +695,10 @@ var readTxtFile;
 Object.freeze(readTxtFile);
 var readBytes;
 (function (readBytes) {
-    readBytes.requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ReadBytesRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ReadBytesRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, start, end } = readBytes.requestType.unpack(buf);
+            const { path, start, end } = requestType.unpack(buf);
             const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
                 .then(file.readBytes.packReply);
             return { promise };
@@ -706,9 +706,9 @@ var readBytes;
     }
     readBytes.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readBytes');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readBytes');
         return (path, start, end) => caller
-            .startPromiseCall(ipcPath, readBytes.requestType.pack({
+            .startPromiseCall(ipcPath, requestType.pack({
             path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
         }))
             .then(file.readBytes.unpackReply);
@@ -731,7 +731,7 @@ var getByteSource;
     }
     getByteSource.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getByteSource');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getByteSource');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
@@ -757,7 +757,7 @@ var readonlyFile;
     }
     readonlyFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readonlyFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readonlyFile');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
@@ -830,7 +830,7 @@ var select;
     }
     select.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('select');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'select');
         return async (path, criteria) => {
             const req = { path, criteria: criteriaToMsg(criteria) };
             const s = new rxjs_1.Subject();
@@ -914,7 +914,7 @@ var fsCollection;
         }
         get.wrapService = wrapService;
         function makeCaller(caller, objPath) {
-            const ipcPath = objPath.concat('get');
+            const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'get');
             return name => caller
                 .startPromiseCall(ipcPath, requestType.pack({ name }))
                 .then(buf => {
@@ -945,7 +945,7 @@ var fsCollection;
         }
         getAll.wrapService = wrapService;
         function makeCaller(caller, objPath) {
-            const ipcPath = objPath.concat('getAll');
+            const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getAll');
             return () => caller
                 .startPromiseCall(ipcPath, undefined)
                 .then(buf => {
@@ -1009,7 +1009,7 @@ var fsCollection;
             };
         }
         function makeIterNextCaller(caller, objPath) {
-            const ipcPath = objPath.concat('next');
+            const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'next');
             return () => caller
                 .startPromiseCall(ipcPath, undefined)
                 .then(buf => unpackIterRes(buf, caller));
@@ -1026,7 +1026,7 @@ var fsCollection;
         }
         entries.wrapService = wrapService;
         function makeCaller(caller, objPath) {
-            const ipcPath = objPath.concat('entries');
+            const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'entries');
             return () => caller
                 .startPromiseCall(ipcPath, undefined)
                 .then(buf => {
@@ -1071,7 +1071,7 @@ var fsCollection;
             return event;
         }
         function makeCaller(caller, objPath) {
-            const path = objPath.concat('watch');
+            const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'watch');
             return obs => {
                 const s = new rxjs_1.Subject();
                 const unsub = caller.startObservableCall(path, undefined, s);
@@ -1169,21 +1169,38 @@ var fsItem;
     fsItem.fsItemFromMsg = fsItemFromMsg;
 })(fsItem = exports.fsItem || (exports.fsItem = {}));
 Object.freeze(fsItem);
+const reqWithPathAndFlagsType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.PathAndFlagsRequestBody);
+function packRequestWithPathAndFlags(path, flags) {
+    return reqWithPathAndFlagsType.pack({
+        path,
+        flags: file.versionedReadFlagsToMsg(flags)
+    });
+}
+function unpackRequestWithPathAndFlags(buf) {
+    const { path, flags } = reqWithPathAndFlagsType.unpack(buf);
+    return {
+        path,
+        flags: file.versionedReadFlagsFromMsg(flags)
+    };
+}
 var vGetXAttr;
 (function (vGetXAttr) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedGetXAttrRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, xaName } = getXAttr.requestType.unpack(buf);
-            const promise = fn(path, xaName)
+            const { path, xaName, flags } = requestType.unpack(buf);
+            const promise = fn(path, xaName, file.versionedReadFlagsFromMsg(flags))
                 .then(attrAndVer => file.vGetXAttr.replyType.pack(attrAndVer));
             return { promise };
         };
     }
     vGetXAttr.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getXAttr');
-        return (path, xaName) => caller
-            .startPromiseCall(ipcPath, getXAttr.requestType.pack({ path, xaName }))
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getXAttr');
+        return (path, xaName, flags) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, xaName, flags: file.versionedReadFlagsToMsg(flags)
+        }))
             .then(file.vGetXAttr.unpackReply);
     }
     vGetXAttr.makeCaller = makeCaller;
@@ -1193,17 +1210,17 @@ var vListXAttrs;
 (function (vListXAttrs) {
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(({ version, lst }) => file.vListXAttrs.replyType.pack({ version, xaNames: lst }));
             return { promise };
         };
     }
     vListXAttrs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('listXAttrs');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'listXAttrs');
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, xaNames } = file.vListXAttrs.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), lst: (xaNames ? xaNames : []) };
@@ -1217,8 +1234,8 @@ var vListFolder;
     const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedListFolderReplyBody);
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(({ version, lst }) => replyType.pack({
                 version, entries: lst.map(lsEntryToMsg)
             }));
@@ -1227,9 +1244,9 @@ var vListFolder;
     }
     vListFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('listFolder');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'listFolder');
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, entries } = replyType.unpack(buf);
             return {
@@ -1244,8 +1261,8 @@ var vReadJSONFile;
 (function (vReadJSONFile) {
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(({ version, json }) => {
                 return file.vReadJSON.replyType.pack({ version, json: JSON.stringify(json) });
             });
@@ -1254,9 +1271,9 @@ var vReadJSONFile;
     }
     vReadJSONFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readJSONFile');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readJSONFile');
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, json } = file.vReadJSON.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), json: JSON.parse(json) };
@@ -1269,17 +1286,17 @@ var vReadTxtFile;
 (function (vReadTxtFile) {
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(verAndTxt => file.vReadTxt.replyType.pack(verAndTxt));
             return { promise };
         };
     }
     vReadTxtFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readTxtFile');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readTxtFile');
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, txt } = file.vReadTxt.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), txt };
@@ -1290,24 +1307,24 @@ var vReadTxtFile;
 Object.freeze(vReadTxtFile);
 var vReadBytes;
 (function (vReadBytes) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedReadBytesRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, start, end } = readBytes.requestType.unpack(buf);
-            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
+            const { path, start, end, flags } = requestType.unpack(buf);
+            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end), file.versionedReadFlagsFromMsg(flags))
                 .then(file.vReadBytes.packReply);
             return { promise };
         };
     }
     vReadBytes.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('readBytes');
-        return (path, start, end) => {
-            return caller
-                .startPromiseCall(ipcPath, readBytes.requestType.pack({
-                path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
-            }))
-                .then(file.vReadBytes.unpackReply);
-        };
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'readBytes');
+        return (path, start, end, flags) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end),
+            flags: file.versionedReadFlagsToMsg(flags)
+        }))
+            .then(file.vReadBytes.unpackReply);
     }
     vReadBytes.makeCaller = makeCaller;
 })(vReadBytes || (vReadBytes = {}));
@@ -1316,7 +1333,7 @@ var vGetByteSource;
 (function (vGetByteSource) {
     function wrapService(fn, expServices) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
             const promise = fn(path)
                 .then(({ version, src }) => {
                 const ref = (0, bytes_1.exposeSrcService)(src, expServices);
@@ -1327,9 +1344,9 @@ var vGetByteSource;
     }
     vGetByteSource.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getByteSource');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getByteSource');
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, src } = file.vGetByteSource.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), src: (0, bytes_1.makeSrcCaller)(caller, src) };
@@ -1359,7 +1376,7 @@ var updateXAttrs;
     }
     updateXAttrs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('updateXAttrs');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'updateXAttrs');
         return (path, changes) => caller
             .startPromiseCall(ipcPath, packRequest(path, changes));
     }
@@ -1378,7 +1395,7 @@ var makeFolder;
     }
     makeFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('makeFolder');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'makeFolder');
         return (path, exclusive) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, exclusive: (0, protobuf_msg_1.toOptVal)(exclusive)
@@ -1399,7 +1416,7 @@ var deleteFolder;
     }
     deleteFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('deleteFolder');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'deleteFolder');
         return (path, removeContent) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, removeContent: (0, protobuf_msg_1.toOptVal)(removeContent)
@@ -1419,7 +1436,7 @@ var deleteFile;
     }
     deleteFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('deleteFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'deleteFile');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }));
     }
@@ -1437,7 +1454,7 @@ var deleteLink;
     }
     deleteLink.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('deleteLink');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'deleteLink');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }));
     }
@@ -1456,7 +1473,7 @@ var move;
     }
     move.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('move');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'move');
         return (src, dst) => caller
             .startPromiseCall(ipcPath, requestType.pack({ src, dst }));
     }
@@ -1475,7 +1492,7 @@ var copyFile;
     }
     copyFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('copyFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'copyFile');
         return (src, dst, overwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             src, dst, overwrite: (0, protobuf_msg_1.toOptVal)(overwrite)
@@ -1496,7 +1513,7 @@ var copyFolder;
     }
     copyFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('copyFolder');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'copyFolder');
         return (src, dst, mergeAndOverwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             src, dst, mergeAndOverwrite: (0, protobuf_msg_1.toOptVal)(mergeAndOverwrite)
@@ -1518,7 +1535,7 @@ var saveFile;
     }
     saveFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('saveFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'saveFile');
         return (f, dst, overwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             file: caller.srvRefOf(f), dst, overwrite: (0, protobuf_msg_1.toOptVal)(overwrite)
@@ -1540,7 +1557,7 @@ var saveFolder;
     }
     saveFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('saveFolder');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'saveFolder');
         return (f, dst, overwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             folder: caller.srvRefOf(f), dst, overwrite: (0, protobuf_msg_1.toOptVal)(overwrite)
@@ -1562,7 +1579,7 @@ var link;
     }
     link.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('link');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'link');
         return (path, f) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, target: caller.srvRefOf(f) }));
     }
@@ -1606,7 +1623,7 @@ var writableSubRoot;
     }
     writableSubRoot.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writableSubRoot');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writableSubRoot');
         return (path, flags) => caller
             .startPromiseCall(ipcPath, packPathAndFlags(path, flags))
             .then(buf => {
@@ -1632,7 +1649,7 @@ var writableFile;
     }
     writableFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writableFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writableFile');
         return (path, flags) => caller
             .startPromiseCall(ipcPath, packPathAndFlags(path, flags))
             .then(buf => {
@@ -1655,7 +1672,7 @@ var writeJSONFile;
     }
     writeJSONFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writeJSONFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writeJSONFile');
         return (path, json, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, json: JSON.stringify(json), flags: optFlagsToMsg(flags)
@@ -1676,7 +1693,7 @@ var writeTxtFile;
     }
     writeTxtFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writeTxtFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writeTxtFile');
         return (path, txt, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, txt, flags: optFlagsToMsg(flags)
@@ -1697,7 +1714,7 @@ var writeBytes;
     }
     writeBytes.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writeBytes');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writeBytes');
         return (path, bytes, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, bytes: bytes, flags: optFlagsToMsg(flags)
@@ -1721,7 +1738,7 @@ var getByteSink;
     }
     getByteSink.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getByteSink');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getByteSink');
         return (path, flags) => caller
             .startPromiseCall(ipcPath, packPathAndFlags(path, flags))
             .then(buf => {
@@ -1744,7 +1761,7 @@ var vUpdateXAttrs;
     }
     vUpdateXAttrs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('updateXAttrs');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'updateXAttrs');
         return (path, changes) => caller
             .startPromiseCall(ipcPath, updateXAttrs.packRequest(path, changes))
             .then(protobuf_msg_1.unpackInt);
@@ -1781,7 +1798,7 @@ var vWriteJSONFile;
     }
     vWriteJSONFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writeJSONFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writeJSONFile');
         return (path, json, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, json: JSON.stringify(json), flags: optVerFlagsToMsg(flags)
@@ -1804,7 +1821,7 @@ var vWriteTxtFile;
     }
     vWriteTxtFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writeTxtFile');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writeTxtFile');
         return (path, txt, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, txt, flags: optVerFlagsToMsg(flags)
@@ -1827,7 +1844,7 @@ var vWriteBytes;
     }
     vWriteBytes.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('writeBytes');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'writeBytes');
         return (path, bytes, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, bytes: bytes, flags: optVerFlagsToMsg(flags)
@@ -1853,7 +1870,7 @@ var vGetByteSink;
     }
     vGetByteSink.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getByteSink');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getByteSink');
         return (path, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, flags: optVerFlagsToMsg(flags)
@@ -1878,7 +1895,7 @@ var vsStatus;
     }
     vsStatus.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('status');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'status');
         return (path) => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(file.unpackSyncStatus);
@@ -1898,7 +1915,7 @@ var vsUpdateStatusInfo;
     }
     vsUpdateStatusInfo.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('updateStatusInfo');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'updateStatusInfo');
         return (path) => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(file.unpackSyncStatus);
@@ -1920,7 +1937,7 @@ var vsIsRemoteVersionOnDisk;
     }
     vsIsRemoteVersionOnDisk.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('isRemoteVersionOnDisk');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'isRemoteVersionOnDisk');
         return (path, version) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, version }))
             .then(buf => replyType.unpack(buf).status);
@@ -1940,7 +1957,7 @@ var vsDownload;
     }
     vsDownload.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('download');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'download');
         return (path, version) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, version
@@ -1952,20 +1969,25 @@ Object.freeze(vsDownload);
 var vsUpload;
 (function (vsUpload) {
     const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncUploadRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncUploadReplyBody);
     function wrapService(fn) {
         return buf => {
             const { path, opts } = requestType.unpack(buf);
-            const promise = fn(path, file.optionsToUploadLocalFromMsg(opts));
+            const promise = fn(path, file.optionsToUploadLocalFromMsg(opts))
+                .then(uploadedVersion => replyType.pack({
+                uploadedVersion: (0, protobuf_msg_1.toOptVal)(uploadedVersion)
+            }));
             return { promise };
         };
     }
     vsUpload.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('upload');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'upload');
         return (path, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, opts: file.optionsToUploadLocalToMsg(opts)
-        }));
+        }))
+            .then(buf => (0, protobuf_msg_1.valOfOptInt)(replyType.unpack(buf).uploadedVersion));
     }
     vsUpload.makeCaller = makeCaller;
 })(vsUpload || (vsUpload = {}));
@@ -2003,7 +2025,7 @@ var vsAdoptRemoteFolderItem;
     }
     vsAdoptRemoteFolderItem.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('adoptRemoteFolderItem');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'adoptRemoteFolderItem');
         return (path, itemName, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, itemName, opts: optionsToAdoptRemoteItemToMsg(opts)
@@ -2025,7 +2047,7 @@ var vsAdoptRemote;
     }
     vsAdoptRemote.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('adoptRemote');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'adoptRemote');
         return (path, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, opts: file.remoteAdoptionOptsToMsg(opts)
@@ -2046,7 +2068,7 @@ var vListVersions;
     }
     vListVersions.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('listVersions');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'listVersions');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(file.vListVersions.unpackReply);
@@ -2067,7 +2089,7 @@ var vArchiveCurrent;
     }
     vArchiveCurrent.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('archiveCurrent');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'archiveCurrent');
         return (path, version) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, version: (0, protobuf_msg_1.toOptVal)(version) }))
             .then(protobuf_msg_1.unpackInt);
@@ -2151,7 +2173,7 @@ var vsDiffCurrentAndRemoteFolderVersions;
     }
     vsDiffCurrentAndRemoteFolderVersions.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('diffCurrentAndRemoteFolderVersions');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'diffCurrentAndRemoteFolderVersions');
         return (path, remoteVersion) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             path, remoteVersion: (0, protobuf_msg_1.toOptVal)(remoteVersion)