core-3nweb-client-lib 0.25.6 → 0.27.0

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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fsItem = exports.fsMsgType = exports.exposeFSService = exports.makeFSCaller = void 0;
+exports.optionsToAdoptRemoteItemFromMsg = exports.optionsToAdoptRemoteItemToMsg = exports.fsItem = exports.fsMsgType = exports.exposeFSService = exports.makeFSCaller = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
 const protobuf_type_1 = require("../lib-client/protobuf-type");
 const fs_proto_1 = require("../protos/fs.proto");
@@ -26,10 +26,11 @@ const file = require("./file");
 const assert_1 = require("../lib-common/assert");
 const bytes_1 = require("./bytes");
 const rxjs_1 = require("rxjs");
-const processes_1 = require("../lib-common/processes");
+const deferred_1 = require("../lib-common/processes/deferred");
 const operators_1 = require("rxjs/operators");
+const utils_for_observables_1 = require("../lib-common/utils-for-observables");
 function makeFSCaller(caller, fsMsg) {
-    connector_1.checkRefObjTypeIs('FSImpl', fsMsg.impl);
+    (0, connector_1.checkRefObjTypeIs)('FSImpl', fsMsg.impl);
     const objPath = fsMsg.impl.path;
     const fs = {
         name: fsMsg.name,
@@ -53,7 +54,7 @@ function makeFSCaller(caller, fsMsg) {
         stat: stat.makeCaller(caller, objPath),
         watchFolder: watch.makeFolderCaller(caller, objPath),
         watchFile: watch.makeFileCaller(caller, objPath),
-        watchTree: watch.makeTreeCaller(caller, objPath),
+        watchTree: watchTree.makeCaller(caller, objPath),
     };
     if (fsMsg.writable) {
         fs.copyFile = copyFile.makeCaller(caller, objPath);
@@ -84,13 +85,31 @@ function makeFSCaller(caller, fsMsg) {
             readBytes: vReadBytes.makeCaller(caller, vPath),
             readJSONFile: vReadJSONFile.makeCaller(caller, vPath),
             readTxtFile: vReadTxtFile.makeCaller(caller, vPath),
+            listVersions: vListVersions.makeCaller(caller, vPath)
         };
-        if (fsMsg.writable) {
+        if (fs.writable) {
             fs.v.getByteSink = vGetByteSink.makeCaller(caller, vPath);
             fs.v.writeBytes = vWriteBytes.makeCaller(caller, vPath);
             fs.v.writeJSONFile = vWriteJSONFile.makeCaller(caller, vPath);
             fs.v.writeTxtFile = vWriteTxtFile.makeCaller(caller, vPath);
             fs.v.updateXAttrs = vUpdateXAttrs.makeCaller(caller, vPath);
+            fs.v.archiveCurrent = vArchiveCurrent.makeCaller(caller, vPath);
+        }
+        if (fsMsg.isSynced) {
+            const vsPath = objPath.concat('v', 'sync');
+            fs.v.sync = {
+                status: vsStatus.makeCaller(caller, vsPath),
+                updateStatusInfo: vsUpdateStatusInfo.makeCaller(caller, vsPath),
+                isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
+                download: vsDownload.makeCaller(caller, vsPath),
+                adoptRemote: vsAdoptRemote.makeCaller(caller, vsPath),
+                diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.makeCaller(caller, vsPath)
+            };
+            if (fs.writable) {
+                fs.v.sync.upload = vsUpload.makeCaller(caller, vsPath);
+                fs.v.sync.adoptRemoteFolderItem =
+                    vsAdoptRemoteFolderItem.makeCaller(caller, vsPath);
+            }
         }
     }
     caller.registerClientDrop(fs, fsMsg.impl);
@@ -117,7 +136,7 @@ function exposeFSService(fs, expServices) {
         stat: stat.wrapService(fs.stat),
         watchFolder: watch.wrapService(fs.watchFolder, packFSEvent),
         watchFile: watch.wrapService(fs.watchFile, file_1.packFileEvent),
-        watchTree: watch.wrapService(fs.watchTree, packFSEvent),
+        watchTree: watchTree.wrapService(fs.watchTree),
     };
     if (fs.writable) {
         implExp.copyFile = copyFile.wrapService(fs.copyFile);
@@ -147,6 +166,7 @@ function exposeFSService(fs, expServices) {
             readBytes: vReadBytes.wrapService(fs.v.readBytes),
             readJSONFile: vReadJSONFile.wrapService(fs.v.readJSONFile),
             readTxtFile: vReadTxtFile.wrapService(fs.v.readTxtFile),
+            listVersions: vListVersions.wrapService(fs.v.listVersions)
         };
         if (fs.writable) {
             implExp.v.getByteSink = vGetByteSink.wrapService(fs.v.getByteSink, expServices);
@@ -154,12 +174,29 @@ function exposeFSService(fs, expServices) {
             implExp.v.writeJSONFile = vWriteJSONFile.wrapService(fs.v.writeJSONFile);
             implExp.v.writeTxtFile = vWriteTxtFile.wrapService(fs.v.writeTxtFile);
             implExp.v.updateXAttrs = vUpdateXAttrs.wrapService(fs.v.updateXAttrs);
+            implExp.v.archiveCurrent = vArchiveCurrent.wrapService(fs.v.archiveCurrent);
+        }
+        if (fs.v.sync) {
+            implExp.v.sync = {
+                status: vsStatus.wrapService(fs.v.sync.status),
+                updateStatusInfo: vsUpdateStatusInfo.wrapService(fs.v.sync.updateStatusInfo),
+                isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(fs.v.sync.isRemoteVersionOnDisk),
+                download: vsDownload.wrapService(fs.v.sync.download),
+                adoptRemote: vsAdoptRemote.wrapService(fs.v.sync.adoptRemote),
+                diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions)
+            };
+            if (fs.writable) {
+                implExp.v.sync.upload = vsUpload.wrapService(fs.v.sync.upload);
+                implExp.v.sync.adoptRemoteFolderItem =
+                    vsAdoptRemoteFolderItem.wrapService(fs.v.sync.adoptRemoteFolderItem);
+            }
         }
     }
     const impl = expServices.exposeDroppableService('FSImpl', implExp, fs);
     const fsMsg = {
         impl,
         isVersioned: !!fs.v,
+        isSynced: !!(fs.v && fs.v.sync),
         name: fs.name,
         type: fs.type,
         writable: fs.writable
@@ -174,7 +211,7 @@ var checkPresence;
     function wrapService(fn) {
         return buf => {
             const { path, throwIfMissing } = requestType.unpack(buf);
-            const promise = fn(path, protobuf_msg_1.valOfOpt(throwIfMissing))
+            const promise = fn(path, (0, protobuf_msg_1.valOfOpt)(throwIfMissing))
                 .then(found => protobuf_msg_1.boolValType.pack({ value: found }));
             return { promise };
         };
@@ -183,7 +220,7 @@ var checkPresence;
     function makeCaller(caller, objPath) {
         return (path, throwIfMissing) => caller
             .startPromiseCall(objPath, requestType.pack({
-            path, throwIfMissing: protobuf_msg_1.toOptVal(throwIfMissing)
+            path, throwIfMissing: (0, protobuf_msg_1.toOptVal)(throwIfMissing)
         }))
             .then(buf => protobuf_msg_1.boolValType.unpack(buf).value);
     }
@@ -258,7 +295,7 @@ var listXAttrs;
         const ipcPath = objPath.concat('listXAttrs');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
-            .then(buf => protobuf_msg_1.fixArray(protobuf_msg_1.strArrValType.unpack(buf).values));
+            .then(buf => (0, protobuf_msg_1.fixArray)(protobuf_msg_1.strArrValType.unpack(buf).values));
     }
     listXAttrs.makeCaller = makeCaller;
 })(listXAttrs || (listXAttrs = {}));
@@ -270,7 +307,7 @@ function exposeSymLink(link, expServices) {
         if (link.isFile) {
             const promise = link.target()
                 .then(f => {
-                const file = file_1.exposeFileService(f, expServices);
+                const file = (0, file_1.exposeFileService)(f, expServices);
                 return symLinkTargetType.pack({ file });
             });
             return { promise };
@@ -284,20 +321,20 @@ function exposeSymLink(link, expServices) {
             return { promise };
         }
         else {
-            assert_1.assert(false);
+            (0, assert_1.assert)(false);
         }
     };
     const ref = expServices.exposeDroppableService('SymLinkImpl', exp, link);
     const msg = {
         readonly: link.readonly,
-        isFile: protobuf_msg_1.toOptVal(link.isFile),
-        isFolder: protobuf_msg_1.toOptVal(link.isFolder),
+        isFile: (0, protobuf_msg_1.toOptVal)(link.isFile),
+        isFolder: (0, protobuf_msg_1.toOptVal)(link.isFolder),
         impl: ref
     };
     return msg;
 }
 function makeSymLinkCaller(caller, linkMsg) {
-    connector_1.checkRefObjTypeIs('SymLinkImpl', linkMsg.impl);
+    (0, connector_1.checkRefObjTypeIs)('SymLinkImpl', linkMsg.impl);
     const link = {
         readonly: linkMsg.readonly,
         target: () => caller
@@ -305,7 +342,7 @@ function makeSymLinkCaller(caller, linkMsg) {
             .then(buf => {
             const { file, fs } = symLinkTargetType.unpack(buf);
             if (file) {
-                return file_1.makeFileCaller(caller, file);
+                return (0, file_1.makeFileCaller)(caller, file);
             }
             else if (fs) {
                 return makeFSCaller(caller, fs);
@@ -314,8 +351,8 @@ function makeSymLinkCaller(caller, linkMsg) {
                 throw new Error('Missing target info');
             }
         }),
-        isFile: protobuf_msg_1.valOfOpt(linkMsg.isFile),
-        isFolder: protobuf_msg_1.valOfOpt(linkMsg.isFolder)
+        isFile: (0, protobuf_msg_1.valOfOpt)(linkMsg.isFile),
+        isFolder: (0, protobuf_msg_1.valOfOpt)(linkMsg.isFolder)
     };
     return link;
 }
@@ -347,54 +384,149 @@ var readLink;
 Object.freeze(readLink);
 const fsEventMsgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSEventMsg);
 function packFSEvent(e) {
-    const m = {
-        type: e.type,
-        path: e.path,
-        isRemote: protobuf_msg_1.toOptVal(e.isRemote),
-        newVersion: protobuf_msg_1.toOptVal(e.newVersion),
-        name: protobuf_msg_1.toOptVal(e.name),
-        oldName: protobuf_msg_1.toOptVal(e.oldName),
-        newName: protobuf_msg_1.toOptVal(e.newName),
-        entry: (e.entry ?
-            protobuf_msg_1.toVal(lsEntryToMsg(e.entry)) : undefined),
-        current: protobuf_msg_1.toOptVal(e.current),
-        lastSynced: protobuf_msg_1.toOptVal(e.lastSynced),
-        remoteVersion: protobuf_msg_1.toOptVal(e.remoteVersion)
-    };
-    return fsEventMsgType.pack(m);
+    const { type, path } = e;
+    switch (type) {
+        case 'removed':
+            return fsEventMsgType.pack({
+                type, path,
+                src: (0, protobuf_msg_1.toVal)(e.src)
+            });
+        case 'remote-removal':
+            return fsEventMsgType.pack({
+                type, path
+            });
+        case 'file-change':
+            return fsEventMsgType.pack({
+                type, path,
+                src: (0, protobuf_msg_1.toVal)(e.src),
+                newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion)
+            });
+        case 'remote-change':
+            return fsEventMsgType.pack({
+                type, path,
+                newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion)
+            });
+        case 'entry-addition':
+            return fsEventMsgType.pack({
+                type, path,
+                src: (0, protobuf_msg_1.toVal)(e.src),
+                newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion),
+                entry: lsEntryToMsg(e.entry),
+                moveLabel: (0, protobuf_msg_1.toOptVal)(e.moveLabel)
+            });
+        case 'entry-removal':
+            return fsEventMsgType.pack({
+                type, path,
+                src: (0, protobuf_msg_1.toVal)(e.src),
+                newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion),
+                name: (0, protobuf_msg_1.toVal)(e.name),
+                moveLabel: (0, protobuf_msg_1.toOptVal)(e.moveLabel)
+            });
+        case 'entry-renaming':
+            return fsEventMsgType.pack({
+                type, path,
+                src: (0, protobuf_msg_1.toVal)(e.src),
+                newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion),
+                oldName: (0, protobuf_msg_1.toVal)(e.oldName),
+                newName: (0, protobuf_msg_1.toVal)(e.newName)
+            });
+        case 'remote-arch-ver-removal':
+            return fsEventMsgType.pack({
+                type, path,
+                removedArchVer: (0, protobuf_msg_1.toVal)(e.removedArchVer)
+            });
+        case 'remote-version-archival':
+            return fsEventMsgType.pack({
+                type, path,
+                archivedVersion: (0, protobuf_msg_1.toVal)(e.archivedVersion)
+            });
+        default:
+            throw new Error(`Unknown event type ${type}`);
+    }
 }
 function unpackFSEvent(buf) {
     const m = fsEventMsgType.unpack(buf);
-    const event = {
-        type: m.type,
-        path: m.path,
-        isRemote: protobuf_msg_1.valOfOpt(m.isRemote),
-        newVersion: protobuf_msg_1.valOfOptInt(m.newVersion),
-        name: protobuf_msg_1.valOfOpt(m.name),
-        oldName: protobuf_msg_1.valOfOpt(m.oldName),
-        newName: protobuf_msg_1.valOfOpt(m.newName),
-        entry: (m.entry ? lsEntryFromMsg(m.entry.value) : undefined),
-        current: protobuf_msg_1.valOfOptInt(m.current),
-        lastSynced: protobuf_msg_1.valOfOptInt(m.lastSynced),
-        remoteVersion: protobuf_msg_1.valOfOptInt(m.remoteVersion)
-    };
-    return event;
+    const { type, path } = m;
+    switch (type) {
+        case 'entry-addition':
+            return {
+                type, path,
+                src: (0, protobuf_msg_1.valOf)(m.src),
+                newVersion: (0, protobuf_msg_1.valOfOptInt)(m.newVersion),
+                entry: lsEntryFromMsg(m.entry),
+                moveLabel: (0, protobuf_msg_1.valOfOptInt)(m.moveLabel)
+            };
+        case 'entry-removal':
+            return {
+                type, path,
+                src: (0, protobuf_msg_1.valOf)(m.src),
+                newVersion: (0, protobuf_msg_1.valOfOptInt)(m.newVersion),
+                name: (0, protobuf_msg_1.valOf)(m.name),
+                moveLabel: (0, protobuf_msg_1.valOfOptInt)(m.moveLabel)
+            };
+        case 'entry-renaming':
+            return {
+                type, path,
+                src: (0, protobuf_msg_1.valOf)(m.src),
+                newVersion: (0, protobuf_msg_1.valOfOptInt)(m.newVersion),
+                oldName: (0, protobuf_msg_1.valOf)(m.oldName),
+                newName: (0, protobuf_msg_1.valOf)(m.newName)
+            };
+        case 'file-change':
+            return {
+                type, path,
+                src: (0, protobuf_msg_1.valOf)(m.src),
+                newVersion: (0, protobuf_msg_1.valOfOptInt)(m.newVersion)
+            };
+        case 'removed':
+            return {
+                type, path,
+                src: (0, protobuf_msg_1.valOf)(m.src)
+            };
+        case 'remote-removal':
+            return {
+                type, path
+            };
+        case 'remote-change':
+            return {
+                type, path, newVersion: (0, protobuf_msg_1.intValOf)(m.newVersion)
+            };
+        case 'remote-arch-ver-removal':
+            return {
+                type, path, removedArchVer: (0, protobuf_msg_1.intValOf)(m.removedArchVer)
+            };
+        case 'remote-version-archival':
+            return {
+                type, path, archivedVersion: (0, protobuf_msg_1.intValOf)(m.archivedVersion)
+            };
+        default:
+            throw new Error(`Unknown event type ${type}`);
+    }
 }
 function lsEntryToMsg(e) {
     return {
         name: e.name,
-        isFile: protobuf_msg_1.toOptVal(e.isFile),
-        isFolder: protobuf_msg_1.toOptVal(e.isFolder),
-        isLink: protobuf_msg_1.toOptVal(e.isLink)
+        isFile: (0, protobuf_msg_1.toOptVal)(e.isFile),
+        isFolder: (0, protobuf_msg_1.toOptVal)(e.isFolder),
+        isLink: (0, protobuf_msg_1.toOptVal)(e.isLink)
     };
 }
 function lsEntryFromMsg(m) {
-    return {
-        name: m.name,
-        isFile: protobuf_msg_1.valOfOpt(m.isFile),
-        isFolder: protobuf_msg_1.valOfOpt(m.isFolder),
-        isLink: protobuf_msg_1.valOfOpt(m.isLink)
-    };
+    const name = m.name;
+    if ((0, protobuf_msg_1.valOfOpt)(m.isFile)) {
+        return { name, isFile: true };
+    }
+    else if ((0, protobuf_msg_1.valOfOpt)(m.isFolder)) {
+        return { name, isFolder: true };
+    }
+    else if ((0, protobuf_msg_1.valOfOpt)(m.isLink)) {
+        return { name, isLink: true };
+    }
+    else {
+        throw (0, connector_1.makeIPCException)({
+            badReply: true, message: `Missing fs entry type flag`
+        });
+    }
 }
 var watch;
 (function (watch) {
@@ -402,7 +534,7 @@ var watch;
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
             const s = new rxjs_1.Subject();
-            const obs = s.asObservable().pipe(operators_1.map(packEvent));
+            const obs = s.asObservable().pipe((0, operators_1.map)(packEvent));
             const onCancel = fn(path, s);
             return { obs, onCancel };
         };
@@ -412,15 +544,9 @@ var watch;
         return (path, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(ipcPath, reqWithPathType.pack({ path }), s);
-            s.subscribe({
-                next: buf => {
-                    if (obs.next) {
-                        obs.next(unpackEvent(buf));
-                    }
-                },
-                complete: obs.complete,
-                error: obs.error
-            });
+            s.asObservable()
+                .pipe((0, operators_1.map)(unpackEvent))
+                .subscribe((0, utils_for_observables_1.toRxObserver)(obs));
             return unsub;
         };
     }
@@ -429,11 +555,6 @@ var watch;
         return makeCaller(caller, ipcPath, unpackFSEvent);
     }
     watch.makeFolderCaller = makeFolderCaller;
-    function makeTreeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('watchTree');
-        return makeCaller(caller, ipcPath, unpackFSEvent);
-    }
-    watch.makeTreeCaller = makeTreeCaller;
     function makeFileCaller(caller, objPath) {
         const ipcPath = objPath.concat('watchFile');
         return makeCaller(caller, ipcPath, file_1.unpackFileEvent);
@@ -441,6 +562,33 @@ var watch;
     watch.makeFileCaller = makeFileCaller;
 })(watch || (watch = {}));
 Object.freeze(watch);
+var watchTree;
+(function (watchTree) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.WatchTreeRequestBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, depth } = requestType.unpack(buf);
+            const s = new rxjs_1.Subject();
+            const obs = s.asObservable().pipe((0, operators_1.map)(packFSEvent));
+            const onCancel = fn(path, (0, protobuf_msg_1.valOfOpt)(depth), s);
+            return { obs, onCancel };
+        };
+    }
+    watchTree.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('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);
+            s.asObservable()
+                .pipe((0, operators_1.map)(unpackFSEvent))
+                .subscribe((0, utils_for_observables_1.toRxObserver)(obs));
+            return unsub;
+        };
+    }
+    watchTree.makeCaller = makeCaller;
+})(watchTree || (watchTree = {}));
+Object.freeze(watchTree);
 var close;
 (function (close) {
     function wrapService(fn) {
@@ -500,7 +648,7 @@ var listFolder;
         const ipcPath = objPath.concat('listFolder');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
-            .then(buf => protobuf_msg_1.fixArray(requestType.unpack(buf).entries).map(lsEntryFromMsg));
+            .then(buf => (0, protobuf_msg_1.fixArray)(requestType.unpack(buf).entries).map(lsEntryFromMsg));
     }
     listFolder.makeCaller = makeCaller;
 })(listFolder || (listFolder = {}));
@@ -531,7 +679,7 @@ var readTxtFile;
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
             const promise = fn(path)
-                .then(txt => protobuf_msg_1.encodeToUtf8(txt));
+                .then(txt => (0, protobuf_msg_1.encodeToUtf8)(txt));
             return { promise };
         };
     }
@@ -540,7 +688,7 @@ var readTxtFile;
         const ipcPath = objPath.concat('readTxtFile');
         return path => caller
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
-            .then(buf => (buf ? protobuf_msg_1.decodeFromUtf8(buf) : ''));
+            .then(buf => (buf ? (0, protobuf_msg_1.decodeFromUtf8)(buf) : ''));
     }
     readTxtFile.makeCaller = makeCaller;
 })(readTxtFile || (readTxtFile = {}));
@@ -551,7 +699,7 @@ var readBytes;
     function wrapService(fn) {
         return buf => {
             const { path, start, end } = readBytes.requestType.unpack(buf);
-            const promise = fn(path, protobuf_msg_1.valOfOptInt(start), protobuf_msg_1.valOfOptInt(end))
+            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
                 .then(file.readBytes.packReply);
             return { promise };
         };
@@ -561,7 +709,7 @@ var readBytes;
         const ipcPath = objPath.concat('readBytes');
         return (path, start, end) => caller
             .startPromiseCall(ipcPath, readBytes.requestType.pack({
-            path, start: protobuf_msg_1.toOptVal(start), end: protobuf_msg_1.toOptVal(end)
+            path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
         }))
             .then(file.readBytes.unpackReply);
     }
@@ -575,7 +723,7 @@ var getByteSource;
             const { path } = reqWithPathType.unpack(buf);
             const promise = fn(path)
                 .then(src => {
-                const ref = bytes_1.exposeSrcService(src, expServices);
+                const ref = (0, bytes_1.exposeSrcService)(src, expServices);
                 return protobuf_msg_1.objRefType.pack(ref);
             });
             return { promise };
@@ -588,7 +736,7 @@ var getByteSource;
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
             const ref = protobuf_msg_1.objRefType.unpack(buf);
-            return bytes_1.makeSrcCaller(caller, ref);
+            return (0, bytes_1.makeSrcCaller)(caller, ref);
         });
     }
     getByteSource.makeCaller = makeCaller;
@@ -601,7 +749,7 @@ var readonlyFile;
             const { path } = reqWithPathType.unpack(buf);
             const promise = fn(path)
                 .then(file => {
-                const fileMsg = file_1.exposeFileService(file, expServices);
+                const fileMsg = (0, file_1.exposeFileService)(file, expServices);
                 return file_1.fileMsgType.pack(fileMsg);
             });
             return { promise };
@@ -614,7 +762,7 @@ var readonlyFile;
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
             const fileMsg = file_1.fileMsgType.unpack(buf);
-            return file_1.makeFileCaller(caller, fileMsg);
+            return (0, file_1.makeFileCaller)(caller, fileMsg);
         });
     }
     readonlyFile.makeCaller = makeCaller;
@@ -628,41 +776,41 @@ var select;
             action: sc.action,
             type: (Array.isArray(sc.type) ?
                 sc.type : ((typeof sc.type === 'string') ? [sc.type] : [])),
-            depth: protobuf_msg_1.toOptVal(sc.depth),
+            depth: (0, protobuf_msg_1.toOptVal)(sc.depth),
         };
         if (typeof sc.name === 'string') {
-            c.pattern = protobuf_msg_1.toVal(sc.name);
+            c.pattern = (0, protobuf_msg_1.toVal)(sc.name);
         }
         else if (sc.name.type === 'pattern') {
-            c.pattern = protobuf_msg_1.toVal(sc.name.p);
+            c.pattern = (0, protobuf_msg_1.toVal)(sc.name.p);
         }
         else if (sc.name.type === 'exact') {
-            c.exactName = protobuf_msg_1.toVal(sc.name.p);
+            c.exactName = (0, protobuf_msg_1.toVal)(sc.name.p);
         }
         else if (sc.name.type === 'regexp') {
-            c.regexp = protobuf_msg_1.toVal(sc.name.p);
+            c.regexp = (0, protobuf_msg_1.toVal)(sc.name.p);
         }
         return c;
     }
     function criteriaFromMsg(c) {
         let name;
         if (c.exactName) {
-            name = { type: 'exact', p: protobuf_msg_1.valOf(c.exactName) };
+            name = { type: 'exact', p: (0, protobuf_msg_1.valOf)(c.exactName) };
         }
         else if (c.pattern) {
-            name = { type: 'pattern', p: protobuf_msg_1.valOf(c.pattern) };
+            name = { type: 'pattern', p: (0, protobuf_msg_1.valOf)(c.pattern) };
         }
         else if (c.regexp) {
-            name = { type: 'regexp', p: protobuf_msg_1.valOf(c.regexp) };
+            name = { type: 'regexp', p: (0, protobuf_msg_1.valOf)(c.regexp) };
         }
         else {
-            throw connector_1.makeIPCException({ message: `Invalid name parameter in select criteria` });
+            throw (0, connector_1.makeIPCException)({ message: `Invalid name parameter in select criteria` });
         }
-        const typeArr = protobuf_msg_1.fixArray(c.type);
+        const typeArr = (0, protobuf_msg_1.fixArray)(c.type);
         const sc = {
             action: c.action,
             name,
-            depth: protobuf_msg_1.valOfOptInt(c.depth),
+            depth: (0, protobuf_msg_1.valOfOptInt)(c.depth),
             type: ((typeArr.length > 0) ? typeArr : undefined)
         };
         return sc;
@@ -687,21 +835,21 @@ var select;
             const req = { path, criteria: criteriaToMsg(criteria) };
             const s = new rxjs_1.Subject();
             caller.startObservableCall(ipcPath, requestType.pack(req), s);
-            const reply = processes_1.defer();
+            const reply = (0, deferred_1.defer)();
             let completion = undefined;
             s.subscribe({
                 next: buf => {
                     const ref = protobuf_msg_1.objRefType.unpack(buf);
                     const collection = fsCollection.makeCollectionCaller(ref, caller);
                     reply.resolve(collection);
-                    completion = processes_1.defer();
+                    completion = (0, deferred_1.defer)();
                 },
                 complete: () => {
                     if (completion) {
                         completion.resolve();
                     }
                     else {
-                        reply.reject(connector_1.makeIPCException({
+                        reply.reject((0, connector_1.makeIPCException)({
                             message: `Early completion sent by core side`
                         }));
                     }
@@ -736,7 +884,7 @@ var fsCollection;
     }
     fsCollection.exposeCollectionService = exposeCollectionService;
     function makeCollectionCaller(ref, caller) {
-        connector_1.checkRefObjTypeIs('FSCollection', ref);
+        (0, connector_1.checkRefObjTypeIs)('FSCollection', ref);
         const objPath = ref.path;
         const collection = {
             get: get.makeCaller(caller, objPath),
@@ -801,7 +949,7 @@ var fsCollection;
             return () => caller
                 .startPromiseCall(ipcPath, undefined)
                 .then(buf => {
-                const items = protobuf_msg_1.fixArray(replyType.unpack(buf).items);
+                const items = (0, protobuf_msg_1.fixArray)(replyType.unpack(buf).items);
                 const pairs = [];
                 for (const { name, item } of items) {
                     pairs.push([name, fsItem.fsItemFromMsg(caller, item)]);
@@ -822,7 +970,7 @@ var fsCollection;
             return ref;
         }
         function makeIterCaller(ref, caller) {
-            connector_1.checkRefObjTypeIs('FSItemsIter', ref);
+            (0, connector_1.checkRefObjTypeIs)('FSItemsIter', ref);
             const objPath = ref.path;
             const iter = {
                 next: makeIterNextCaller(caller, objPath)
@@ -834,7 +982,7 @@ var fsCollection;
         function packIterRes(res, expServices) {
             let msg;
             if (res.done) {
-                msg = { done: protobuf_msg_1.toVal(true) };
+                msg = { done: (0, protobuf_msg_1.toVal)(true) };
             }
             else {
                 const itemRef = fsItem.exposeFSItem(expServices, res.value[1]);
@@ -895,7 +1043,7 @@ var fsCollection;
         function wrapService(fn, expServices) {
             return () => {
                 const s = new rxjs_1.Subject();
-                const obs = s.asObservable().pipe(operators_1.map(event => packEvent(event, expServices)));
+                const obs = s.asObservable().pipe((0, operators_1.map)(event => packEvent(event, expServices)));
                 const onCancel = fn(s);
                 return { obs, onCancel };
             };
@@ -904,7 +1052,7 @@ var fsCollection;
         function packEvent(event, expServices) {
             const msg = {
                 type: event.type,
-                path: protobuf_msg_1.toOptVal(event.path)
+                path: (0, protobuf_msg_1.toOptVal)(event.path)
             };
             if (event.item) {
                 msg.item = fsItem.exposeFSItem(expServices, event.item);
@@ -915,7 +1063,7 @@ var fsCollection;
             const msg = eventType.unpack(buf);
             const event = {
                 type: msg.type,
-                path: protobuf_msg_1.valOfOpt(msg.path)
+                path: (0, protobuf_msg_1.valOfOpt)(msg.path)
             };
             if (msg.item) {
                 event.item = fsItem.fsItemFromMsg(caller, msg.item);
@@ -927,15 +1075,9 @@ var fsCollection;
             return obs => {
                 const s = new rxjs_1.Subject();
                 const unsub = caller.startObservableCall(path, undefined, s);
-                s.subscribe({
-                    next: buf => {
-                        if (obs.next) {
-                            obs.next(unpackEvent(buf, caller));
-                        }
-                    },
-                    complete: obs.complete,
-                    error: obs.error
-                });
+                s.asObservable()
+                    .pipe((0, operators_1.map)(buf => unpackEvent(buf, caller)))
+                    .subscribe((0, utils_for_observables_1.toRxObserver)(obs));
                 return unsub;
             };
         }
@@ -949,18 +1091,18 @@ var fsItem;
     fsItem.msgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSItem);
     function exposeFSItem(expServices, item) {
         const msg = {
-            isLink: protobuf_msg_1.toOptVal(item.isLink)
+            isLink: (0, protobuf_msg_1.toOptVal)(item.isLink)
         };
         if (item.isFile) {
-            msg.isFile = protobuf_msg_1.toVal(true);
+            msg.isFile = (0, protobuf_msg_1.toVal)(true);
             if (item.item) {
                 msg.item = {
-                    file: file_1.exposeFileService(item.item, expServices)
+                    file: (0, file_1.exposeFileService)(item.item, expServices)
                 };
             }
         }
         else if (item.isFolder) {
-            msg.isFolder = protobuf_msg_1.toVal(true);
+            msg.isFolder = (0, protobuf_msg_1.toVal)(true);
             if (item.item) {
                 msg.item = {
                     fs: exposeFSService(item.item, expServices)
@@ -968,7 +1110,7 @@ var fsItem;
             }
         }
         else if (item.isCollection) {
-            msg.isCollection = protobuf_msg_1.toVal(true);
+            msg.isCollection = (0, protobuf_msg_1.toVal)(true);
             if (item.item) {
                 msg.item = {
                     collection: fsCollection.exposeCollectionService(item.item, expServices)
@@ -991,21 +1133,21 @@ var fsItem;
     fsItem.exposeFSItem = exposeFSItem;
     function fsItemFromMsg(caller, msg) {
         const item = {
-            isLink: protobuf_msg_1.valOfOpt(msg.isLink)
+            isLink: (0, protobuf_msg_1.valOfOpt)(msg.isLink)
         };
-        if (protobuf_msg_1.valOfOpt(msg.isFile)) {
+        if ((0, protobuf_msg_1.valOfOpt)(msg.isFile)) {
             item.isFile = true;
             if (msg.item) {
-                item.item = file_1.makeFileCaller(caller, msg.item.file);
+                item.item = (0, file_1.makeFileCaller)(caller, msg.item.file);
             }
         }
-        else if (protobuf_msg_1.valOfOpt(msg.isFolder)) {
+        else if ((0, protobuf_msg_1.valOfOpt)(msg.isFolder)) {
             item.isFolder = true;
             if (msg.item) {
                 item.item = makeFSCaller(caller, msg.item.fs);
             }
         }
-        else if (protobuf_msg_1.valOfOpt(msg.isCollection)) {
+        else if ((0, protobuf_msg_1.valOfOpt)(msg.isCollection)) {
             item.isCollection = true;
             if (msg.item) {
                 item.item = fsCollection.makeCollectionCaller(msg.item.collection, caller);
@@ -1064,7 +1206,7 @@ var vListXAttrs;
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
             const { version: v, xaNames } = file.vListXAttrs.replyType.unpack(buf);
-            return { version: protobuf_msg_1.fixInt(v), lst: (xaNames ? xaNames : []) };
+            return { version: (0, protobuf_msg_1.fixInt)(v), lst: (xaNames ? xaNames : []) };
         });
     }
     vListXAttrs.makeCaller = makeCaller;
@@ -1091,7 +1233,7 @@ var vListFolder;
             .then(buf => {
             const { version: v, entries } = replyType.unpack(buf);
             return {
-                version: protobuf_msg_1.fixInt(v), lst: protobuf_msg_1.fixArray(entries.map(lsEntryFromMsg))
+                version: (0, protobuf_msg_1.fixInt)(v), lst: (0, protobuf_msg_1.fixArray)(entries.map(lsEntryFromMsg))
             };
         });
     }
@@ -1117,7 +1259,7 @@ var vReadJSONFile;
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
             const { version: v, json } = file.vReadJSON.replyType.unpack(buf);
-            return { version: protobuf_msg_1.fixInt(v), json: JSON.parse(json) };
+            return { version: (0, protobuf_msg_1.fixInt)(v), json: JSON.parse(json) };
         });
     }
     vReadJSONFile.makeCaller = makeCaller;
@@ -1140,7 +1282,7 @@ var vReadTxtFile;
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
             const { version: v, txt } = file.vReadTxt.replyType.unpack(buf);
-            return { version: protobuf_msg_1.fixInt(v), txt };
+            return { version: (0, protobuf_msg_1.fixInt)(v), txt };
         });
     }
     vReadTxtFile.makeCaller = makeCaller;
@@ -1151,7 +1293,7 @@ var vReadBytes;
     function wrapService(fn) {
         return buf => {
             const { path, start, end } = readBytes.requestType.unpack(buf);
-            const promise = fn(path, protobuf_msg_1.valOfOptInt(start), protobuf_msg_1.valOfOptInt(end))
+            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
                 .then(file.vReadBytes.packReply);
             return { promise };
         };
@@ -1162,7 +1304,7 @@ var vReadBytes;
         return (path, start, end) => {
             return caller
                 .startPromiseCall(ipcPath, readBytes.requestType.pack({
-                path, start: protobuf_msg_1.toOptVal(start), end: protobuf_msg_1.toOptVal(end)
+                path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
             }))
                 .then(file.vReadBytes.unpackReply);
         };
@@ -1177,7 +1319,7 @@ var vGetByteSource;
             const { path } = reqWithPathType.unpack(buf);
             const promise = fn(path)
                 .then(({ version, src }) => {
-                const ref = bytes_1.exposeSrcService(src, expServices);
+                const ref = (0, bytes_1.exposeSrcService)(src, expServices);
                 return file.vGetByteSource.replyType.pack({ version, src: ref });
             });
             return { promise };
@@ -1190,7 +1332,7 @@ var vGetByteSource;
             .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
             .then(buf => {
             const { version: v, src } = file.vGetByteSource.replyType.unpack(buf);
-            return { version: protobuf_msg_1.fixInt(v), src: bytes_1.makeSrcCaller(caller, src) };
+            return { version: (0, protobuf_msg_1.fixInt)(v), src: (0, bytes_1.makeSrcCaller)(caller, src) };
         });
     }
     vGetByteSource.makeCaller = makeCaller;
@@ -1230,7 +1372,7 @@ var makeFolder;
     function wrapService(fn) {
         return buf => {
             const { path, exclusive } = requestType.unpack(buf);
-            const promise = fn(path, protobuf_msg_1.valOfOpt(exclusive));
+            const promise = fn(path, (0, protobuf_msg_1.valOfOpt)(exclusive));
             return { promise };
         };
     }
@@ -1239,7 +1381,7 @@ var makeFolder;
         const ipcPath = objPath.concat('makeFolder');
         return (path, exclusive) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            path, exclusive: protobuf_msg_1.toOptVal(exclusive)
+            path, exclusive: (0, protobuf_msg_1.toOptVal)(exclusive)
         }));
     }
     makeFolder.makeCaller = makeCaller;
@@ -1251,7 +1393,7 @@ var deleteFolder;
     function wrapService(fn) {
         return buf => {
             const { path, removeContent } = requestType.unpack(buf);
-            const promise = fn(path, protobuf_msg_1.valOfOpt(removeContent));
+            const promise = fn(path, (0, protobuf_msg_1.valOfOpt)(removeContent));
             return { promise };
         };
     }
@@ -1260,7 +1402,7 @@ var deleteFolder;
         const ipcPath = objPath.concat('deleteFolder');
         return (path, removeContent) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            path, removeContent: protobuf_msg_1.toOptVal(removeContent)
+            path, removeContent: (0, protobuf_msg_1.toOptVal)(removeContent)
         }));
     }
     deleteFolder.makeCaller = makeCaller;
@@ -1327,7 +1469,7 @@ var copyFile;
     function wrapService(fn) {
         return buf => {
             const { src, dst, overwrite } = requestType.unpack(buf);
-            const promise = fn(src, dst, protobuf_msg_1.valOfOpt(overwrite));
+            const promise = fn(src, dst, (0, protobuf_msg_1.valOfOpt)(overwrite));
             return { promise };
         };
     }
@@ -1336,7 +1478,7 @@ var copyFile;
         const ipcPath = objPath.concat('copyFile');
         return (src, dst, overwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            src, dst, overwrite: protobuf_msg_1.toOptVal(overwrite)
+            src, dst, overwrite: (0, protobuf_msg_1.toOptVal)(overwrite)
         }));
     }
     copyFile.makeCaller = makeCaller;
@@ -1348,7 +1490,7 @@ var copyFolder;
     function wrapService(fn) {
         return buf => {
             const { src, dst, mergeAndOverwrite } = requestType.unpack(buf);
-            const promise = fn(src, dst, protobuf_msg_1.valOfOpt(mergeAndOverwrite));
+            const promise = fn(src, dst, (0, protobuf_msg_1.valOfOpt)(mergeAndOverwrite));
             return { promise };
         };
     }
@@ -1357,7 +1499,7 @@ var copyFolder;
         const ipcPath = objPath.concat('copyFolder');
         return (src, dst, mergeAndOverwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            src, dst, mergeAndOverwrite: protobuf_msg_1.toOptVal(mergeAndOverwrite)
+            src, dst, mergeAndOverwrite: (0, protobuf_msg_1.toOptVal)(mergeAndOverwrite)
         }));
     }
     copyFolder.makeCaller = makeCaller;
@@ -1370,7 +1512,7 @@ var saveFile;
         return buf => {
             const { dst, file, overwrite } = requestType.unpack(buf);
             const f = expServices.getOriginalObj(file);
-            const promise = fn(f, dst, protobuf_msg_1.valOfOpt(overwrite));
+            const promise = fn(f, dst, (0, protobuf_msg_1.valOfOpt)(overwrite));
             return { promise };
         };
     }
@@ -1379,7 +1521,7 @@ var saveFile;
         const ipcPath = objPath.concat('saveFile');
         return (f, dst, overwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            file: caller.srvRefOf(f), dst, overwrite: protobuf_msg_1.toOptVal(overwrite)
+            file: caller.srvRefOf(f), dst, overwrite: (0, protobuf_msg_1.toOptVal)(overwrite)
         }));
     }
     saveFile.makeCaller = makeCaller;
@@ -1392,7 +1534,7 @@ var saveFolder;
         return buf => {
             const { dst, folder: file, overwrite } = requestType.unpack(buf);
             const f = expServices.getOriginalObj(file);
-            const promise = fn(f, dst, protobuf_msg_1.valOfOpt(overwrite));
+            const promise = fn(f, dst, (0, protobuf_msg_1.valOfOpt)(overwrite));
             return { promise };
         };
     }
@@ -1401,7 +1543,7 @@ var saveFolder;
         const ipcPath = objPath.concat('saveFolder');
         return (f, dst, overwrite) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            folder: caller.srvRefOf(f), dst, overwrite: protobuf_msg_1.toOptVal(overwrite)
+            folder: caller.srvRefOf(f), dst, overwrite: (0, protobuf_msg_1.toOptVal)(overwrite)
         }));
     }
     saveFolder.makeCaller = makeCaller;
@@ -1437,16 +1579,16 @@ function unpackPathAndFlags(buf) {
 }
 function optFlagsToMsg(flags) {
     return (flags ? {
-        create: protobuf_msg_1.toOptVal(flags.create),
-        exclusive: protobuf_msg_1.toOptVal(flags.exclusive),
-        truncate: protobuf_msg_1.toOptVal(flags.truncate)
+        create: (0, protobuf_msg_1.toOptVal)(flags.create),
+        exclusive: (0, protobuf_msg_1.toOptVal)(flags.exclusive),
+        truncate: (0, protobuf_msg_1.toOptVal)(flags.truncate)
     } : undefined);
 }
 function optFlagsFromMsg(m) {
     return (m ? {
-        create: protobuf_msg_1.valOfOpt(m.create),
-        exclusive: protobuf_msg_1.valOfOpt(m.exclusive),
-        truncate: protobuf_msg_1.valOfOpt(m.truncate)
+        create: (0, protobuf_msg_1.valOfOpt)(m.create),
+        exclusive: (0, protobuf_msg_1.valOfOpt)(m.exclusive),
+        truncate: (0, protobuf_msg_1.valOfOpt)(m.truncate)
     } : undefined);
 }
 var writableSubRoot;
@@ -1482,7 +1624,7 @@ var writableFile;
             const { path, flags } = unpackPathAndFlags(buf);
             const promise = fn(path, flags)
                 .then(file => {
-                const fileMsg = file_1.exposeFileService(file, expServices);
+                const fileMsg = (0, file_1.exposeFileService)(file, expServices);
                 return file_1.fileMsgType.pack(fileMsg);
             });
             return { promise };
@@ -1495,7 +1637,7 @@ var writableFile;
             .startPromiseCall(ipcPath, packPathAndFlags(path, flags))
             .then(buf => {
             const fileMsg = file_1.fileMsgType.unpack(buf);
-            return file_1.makeFileCaller(caller, fileMsg);
+            return (0, file_1.makeFileCaller)(caller, fileMsg);
         });
     }
     writableFile.makeCaller = makeCaller;
@@ -1558,9 +1700,7 @@ var writeBytes;
         const ipcPath = objPath.concat('writeBytes');
         return (path, bytes, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            path,
-            bytes: bytes,
-            flags: optFlagsToMsg(flags)
+            path, bytes: bytes, flags: optFlagsToMsg(flags)
         }));
     }
     writeBytes.makeCaller = makeCaller;
@@ -1573,7 +1713,7 @@ var getByteSink;
             const { path, flags } = unpackPathAndFlags(buf);
             const promise = fn(path, flags)
                 .then(sink => {
-                const ref = bytes_1.exposeSinkService(sink, expServices);
+                const ref = (0, bytes_1.exposeSinkService)(sink, expServices);
                 return protobuf_msg_1.objRefType.pack(ref);
             });
             return { promise };
@@ -1586,7 +1726,7 @@ var getByteSink;
             .startPromiseCall(ipcPath, packPathAndFlags(path, flags))
             .then(buf => {
             const ref = protobuf_msg_1.objRefType.unpack(buf);
-            return bytes_1.makeSinkCaller(caller, ref);
+            return (0, bytes_1.makeSinkCaller)(caller, ref);
         });
     }
     getByteSink.makeCaller = makeCaller;
@@ -1617,7 +1757,7 @@ function optVerFlagsToMsg(f) {
         return;
     }
     const m = optFlagsToMsg(f);
-    m.currentVersion = protobuf_msg_1.toOptVal(f.currentVersion);
+    m.currentVersion = (0, protobuf_msg_1.toOptVal)(f.currentVersion);
     return m;
 }
 function optVerFlagsFromMsg(m) {
@@ -1625,7 +1765,7 @@ function optVerFlagsFromMsg(m) {
         return;
     }
     const f = optFlagsFromMsg(m);
-    f.currentVersion = protobuf_msg_1.valOfOpt(m.currentVersion);
+    f.currentVersion = (0, protobuf_msg_1.valOfOpt)(m.currentVersion);
     return f;
 }
 var vWriteJSONFile;
@@ -1690,9 +1830,7 @@ var vWriteBytes;
         const ipcPath = objPath.concat('writeBytes');
         return (path, bytes, flags) => caller
             .startPromiseCall(ipcPath, requestType.pack({
-            path,
-            bytes: bytes,
-            flags: optVerFlagsToMsg(flags)
+            path, bytes: bytes, flags: optVerFlagsToMsg(flags)
         }))
             .then(protobuf_msg_1.unpackInt);
     }
@@ -1707,7 +1845,7 @@ var vGetByteSink;
             const { path, flags } = requestType.unpack(buf);
             const promise = fn(path, optVerFlagsFromMsg(flags))
                 .then(({ version, sink }) => {
-                const ref = bytes_1.exposeSinkService(sink, expServices);
+                const ref = (0, bytes_1.exposeSinkService)(sink, expServices);
                 return file.vGetByteSink.replyType.pack({ version, sink: ref });
             });
             return { promise };
@@ -1722,10 +1860,305 @@ var vGetByteSink;
         }))
             .then(buf => {
             const { sink, version: v } = file.vGetByteSink.replyType.unpack(buf);
-            return { version: protobuf_msg_1.fixInt(v), sink: bytes_1.makeSinkCaller(caller, sink) };
+            return { version: (0, protobuf_msg_1.fixInt)(v), sink: (0, bytes_1.makeSinkCaller)(caller, sink) };
         });
     }
     vGetByteSink.makeCaller = makeCaller;
 })(vGetByteSink || (vGetByteSink = {}));
 Object.freeze(vGetByteSink);
+var vsStatus;
+(function (vsStatus) {
+    function wrapService(fn) {
+        return buf => {
+            const { path } = reqWithPathType.unpack(buf);
+            const promise = fn(path)
+                .then(file.packSyncStatus);
+            return { promise };
+        };
+    }
+    vsStatus.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('status');
+        return (path) => caller
+            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+            .then(file.unpackSyncStatus);
+    }
+    vsStatus.makeCaller = makeCaller;
+})(vsStatus || (vsStatus = {}));
+Object.freeze(vsStatus);
+var vsUpdateStatusInfo;
+(function (vsUpdateStatusInfo) {
+    function wrapService(fn) {
+        return buf => {
+            const { path } = reqWithPathType.unpack(buf);
+            const promise = fn(path)
+                .then(file.packSyncStatus);
+            return { promise };
+        };
+    }
+    vsUpdateStatusInfo.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('updateStatusInfo');
+        return (path) => caller
+            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+            .then(file.unpackSyncStatus);
+    }
+    vsUpdateStatusInfo.makeCaller = makeCaller;
+})(vsUpdateStatusInfo || (vsUpdateStatusInfo = {}));
+Object.freeze(vsUpdateStatusInfo);
+var vsIsRemoteVersionOnDisk;
+(function (vsIsRemoteVersionOnDisk) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncIsOnDiskRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncIsOnDiskReplyBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, version } = requestType.unpack(buf);
+            const promise = fn(path, (0, protobuf_msg_1.fixInt)(version))
+                .then(status => replyType.pack({ status }));
+            return { promise };
+        };
+    }
+    vsIsRemoteVersionOnDisk.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('isRemoteVersionOnDisk');
+        return (path, version) => caller
+            .startPromiseCall(ipcPath, requestType.pack({ path, version }))
+            .then(buf => replyType.unpack(buf).status);
+    }
+    vsIsRemoteVersionOnDisk.makeCaller = makeCaller;
+})(vsIsRemoteVersionOnDisk || (vsIsRemoteVersionOnDisk = {}));
+Object.freeze(vsIsRemoteVersionOnDisk);
+var vsDownload;
+(function (vsDownload) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncDownloadRequestBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, version } = requestType.unpack(buf);
+            const promise = fn(path, (0, protobuf_msg_1.fixInt)(version));
+            return { promise };
+        };
+    }
+    vsDownload.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('download');
+        return (path, version) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, version
+        }));
+    }
+    vsDownload.makeCaller = makeCaller;
+})(vsDownload || (vsDownload = {}));
+Object.freeze(vsDownload);
+var vsUpload;
+(function (vsUpload) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncUploadRequestBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, opts } = requestType.unpack(buf);
+            const promise = fn(path, file.optionsToUploadLocalFromMsg(opts));
+            return { promise };
+        };
+    }
+    vsUpload.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('upload');
+        return (path, opts) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, opts: file.optionsToUploadLocalToMsg(opts)
+        }));
+    }
+    vsUpload.makeCaller = makeCaller;
+})(vsUpload || (vsUpload = {}));
+Object.freeze(vsUpload);
+function optionsToAdoptRemoteItemToMsg(opts) {
+    if (!opts) {
+        return;
+    }
+    return {
+        localVersion: (0, protobuf_msg_1.toOptVal)(opts.localVersion),
+        remoteVersion: (0, protobuf_msg_1.toOptVal)(opts.remoteVersion)
+    };
+}
+exports.optionsToAdoptRemoteItemToMsg = optionsToAdoptRemoteItemToMsg;
+function optionsToAdoptRemoteItemFromMsg(msg) {
+    if (!msg) {
+        return;
+    }
+    return {
+        localVersion: (0, protobuf_msg_1.valOfOptInt)(msg.localVersion),
+        remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion)
+    };
+}
+exports.optionsToAdoptRemoteItemFromMsg = optionsToAdoptRemoteItemFromMsg;
+var vsAdoptRemoteFolderItem;
+(function (vsAdoptRemoteFolderItem) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptRemoteFolderItemRequestBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, itemName, opts } = requestType.unpack(buf);
+            const promise = fn(path, itemName, optionsToAdoptRemoteItemFromMsg(opts))
+                .then(protobuf_msg_1.packInt);
+            return { promise };
+        };
+    }
+    vsAdoptRemoteFolderItem.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('adoptRemoteFolderItem');
+        return (path, itemName, opts) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, itemName, opts: optionsToAdoptRemoteItemToMsg(opts)
+        }))
+            .then(protobuf_msg_1.unpackInt);
+    }
+    vsAdoptRemoteFolderItem.makeCaller = makeCaller;
+})(vsAdoptRemoteFolderItem || (vsAdoptRemoteFolderItem = {}));
+Object.freeze(vsAdoptRemoteFolderItem);
+var vsAdoptRemote;
+(function (vsAdoptRemote) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptRemoteRequestBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, opts } = requestType.unpack(buf);
+            const promise = fn(path, file.remoteAdoptionOptsFromMsg(opts));
+            return { promise };
+        };
+    }
+    vsAdoptRemote.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('adoptRemote');
+        return (path, opts) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, opts: file.remoteAdoptionOptsToMsg(opts)
+        }));
+    }
+    vsAdoptRemote.makeCaller = makeCaller;
+})(vsAdoptRemote || (vsAdoptRemote = {}));
+Object.freeze(vsAdoptRemote);
+var vListVersions;
+(function (vListVersions) {
+    function wrapService(fn) {
+        return buf => {
+            const { path } = reqWithPathType.unpack(buf);
+            const promise = fn(path)
+                .then(file.vListVersions.packReply);
+            return { promise };
+        };
+    }
+    vListVersions.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('listVersions');
+        return path => caller
+            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+            .then(file.vListVersions.unpackReply);
+    }
+    vListVersions.makeCaller = makeCaller;
+})(vListVersions || (vListVersions = {}));
+Object.freeze(vListVersions);
+var vArchiveCurrent;
+(function (vArchiveCurrent) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ArchiveCurrentRequestBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, version } = requestType.unpack(buf);
+            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(version))
+                .then(protobuf_msg_1.packInt);
+            return { promise };
+        };
+    }
+    vArchiveCurrent.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('archiveCurrent');
+        return (path, version) => caller
+            .startPromiseCall(ipcPath, requestType.pack({ path, version: (0, protobuf_msg_1.toOptVal)(version) }))
+            .then(protobuf_msg_1.unpackInt);
+    }
+    vArchiveCurrent.makeCaller = makeCaller;
+})(vArchiveCurrent || (vArchiveCurrent = {}));
+Object.freeze(vArchiveCurrent);
+function folderDiffToMsg(diff) {
+    var _a, _b, _c, _d;
+    if (!diff) {
+        return;
+    }
+    return {
+        remoteVersion: (0, protobuf_msg_1.toOptVal)(diff.remoteVersion),
+        currentVersion: diff.currentVersion,
+        isCurrentLocal: diff.isCurrentLocal,
+        isRemoteArchived: diff.isRemoteArchived,
+        inCurrent: (_a = diff.inCurrent) === null || _a === void 0 ? void 0 : _a.map(lsEntryToMsg),
+        inRemote: (_b = diff.inRemote) === null || _b === void 0 ? void 0 : _b.map(lsEntryToMsg),
+        nameOverlaps: diff.nameOverlaps,
+        ctime: diffTStoMsg(diff.ctime),
+        mtime: diffTStoMsg(diff.mtime),
+        xattrs: (diff.xattrs ? {
+            inCurrent: (_c = diff.xattrs.inCurrent) === null || _c === void 0 ? void 0 : _c.map(({ name, value }) => file.xattrToMsg(name, value)),
+            inRemote: (_d = diff.xattrs.inRemote) === null || _d === void 0 ? void 0 : _d.map(({ name, value }) => file.xattrToMsg(name, value)),
+            nameOverlaps: diff.xattrs.nameOverlaps
+        } : undefined)
+    };
+}
+function diffTStoMsg(diffTS) {
+    var _a;
+    return {
+        current: diffTS.current.valueOf(),
+        remote: (0, protobuf_msg_1.toOptVal)((_a = diffTS.remote) === null || _a === void 0 ? void 0 : _a.valueOf())
+    };
+}
+function folderDiffFromMsg(msg) {
+    if (!msg) {
+        return;
+    }
+    return {
+        remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion),
+        currentVersion: (0, protobuf_msg_1.fixInt)(msg.currentVersion),
+        isCurrentLocal: msg.isCurrentLocal,
+        isRemoteArchived: msg.isRemoteArchived,
+        inCurrent: ((msg.inCurrent.length > 0) ?
+            msg.inCurrent.map(lsEntryFromMsg) : undefined),
+        inRemote: ((msg.inRemote.length > 0) ?
+            msg.inRemote.map(lsEntryFromMsg) : undefined),
+        nameOverlaps: ((msg.nameOverlaps.length > 0) ?
+            msg.nameOverlaps : undefined),
+        ctime: diffTSfromMsg(msg.ctime),
+        mtime: diffTSfromMsg(msg.mtime),
+        xattrs: (msg.xattrs ? {
+            inCurrent: ((msg.xattrs.inCurrent.length > 0) ?
+                msg.xattrs.inCurrent.map(file.xattrFromMsg) : undefined),
+            inRemote: ((msg.xattrs.inRemote.length > 0) ?
+                msg.xattrs.inRemote.map(file.xattrFromMsg) : undefined),
+            nameOverlaps: ((msg.xattrs.nameOverlaps.length > 0) ?
+                msg.xattrs.nameOverlaps : undefined)
+        } : undefined)
+    };
+}
+function diffTSfromMsg(m) {
+    return {
+        current: new Date((0, protobuf_msg_1.fixInt)(m.current)),
+        remote: (m.remote ? new Date((0, protobuf_msg_1.intValOf)(m.remote)) : undefined)
+    };
+}
+var vsDiffCurrentAndRemoteFolderVersions;
+(function (vsDiffCurrentAndRemoteFolderVersions) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteReplyBody);
+    function wrapService(fn) {
+        return buf => {
+            const { path, remoteVersion } = requestType.unpack(buf);
+            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(remoteVersion))
+                .then(diff => replyType.pack({ diff: folderDiffToMsg(diff) }));
+            return { promise };
+        };
+    }
+    vsDiffCurrentAndRemoteFolderVersions.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = objPath.concat('diffCurrentAndRemoteFolderVersions');
+        return (path, remoteVersion) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, remoteVersion: (0, protobuf_msg_1.toOptVal)(remoteVersion)
+        }))
+            .then(buf => folderDiffFromMsg(replyType.unpack(buf).diff));
+    }
+    vsDiffCurrentAndRemoteFolderVersions.makeCaller = makeCaller;
+})(vsDiffCurrentAndRemoteFolderVersions || (vsDiffCurrentAndRemoteFolderVersions = {}));
+Object.freeze(vsDiffCurrentAndRemoteFolderVersions);
 Object.freeze(exports);