core-3nweb-client-lib 0.43.8 → 0.43.9

package/build/core-ipc/file.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vListVersions = exports.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.vStat = exports.readBytes = exports.fileMsgType = void 0;
+exports.vListVersions = exports.vsUpload = exports.vsStartUpload = exports.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.vStat = exports.readBytes = exports.fileMsgType = void 0;
 exports.makeFileCaller = makeFileCaller;
 exports.exposeFileService = exposeFileService;
 exports.packStats = packStats;
@@ -27,8 +27,8 @@ exports.packXAttrValue = packXAttrValue;
 exports.unpackXAttrValue = unpackXAttrValue;
 exports.packJSON = packJSON;
 exports.unpackJSON = unpackJSON;
-exports.packFileEvent = packFileEvent;
-exports.unpackFileEvent = unpackFileEvent;
+exports.packEvent = packEvent;
+exports.unpackEvent = unpackEvent;
 exports.versionedReadFlagsFromMsg = versionedReadFlagsFromMsg;
 exports.versionedReadFlagsToMsg = versionedReadFlagsToMsg;
 exports.xattrToMsg = xattrToMsg;
@@ -40,6 +40,7 @@ exports.remoteAdoptionOptsFromMsg = remoteAdoptionOptsFromMsg;
 const protobuf_msg_1 = require("../ipc-via-protobuf/protobuf-msg");
 const protobuf_type_1 = require("../lib-client/protobuf-type");
 const file_proto_1 = require("../protos/file.proto");
+const common_proto_1 = require("../protos/common.proto");
 const connector_1 = require("../ipc-via-protobuf/connector");
 const error_1 = require("../lib-common/exceptions/error");
 const bytes_1 = require("./bytes");
@@ -101,6 +102,7 @@ function makeFileCaller(caller, fileMsg) {
                 adoptRemote: vsAdoptRemote.makeCaller(caller, vsPath),
             };
             if (file.writable) {
+                file.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
                 file.v.sync.upload = vsUpload.makeCaller(caller, vsPath);
             }
         }
@@ -155,6 +157,7 @@ function exposeFileService(file, expServices) {
                 adoptRemote: vsAdoptRemote.wrapService(file.v.sync.adoptRemote),
             };
             if (file.writable) {
+                implExp.v.sync.startedUpload = vsStartUpload.wrapService(file.v.sync.startUpload);
                 implExp.v.sync.upload = vsUpload.wrapService(file.v.sync.upload);
             }
         }
@@ -185,6 +188,8 @@ function statsToMsg(s) {
         mtime: (s.mtime ? (0, protobuf_msg_1.toVal)(s.mtime.valueOf()) : undefined),
         size: (0, protobuf_msg_1.toOptVal)(s.size),
         version: (0, protobuf_msg_1.toOptVal)(s.version),
+        bytesNeedDownload: (0, protobuf_msg_1.toOptVal)(s.bytesNeedDownload),
+        versionSyncBranch: (0, protobuf_msg_1.toOptVal)(s.versionSyncBranch),
     };
 }
 function unpackStats(buf) {
@@ -198,6 +203,8 @@ function msgToStats(m) {
         isLink: (0, protobuf_msg_1.valOfOpt)(m.isLink),
         size: (0, protobuf_msg_1.valOfOptInt)(m.size),
         version: (0, protobuf_msg_1.valOfOptInt)(m.version),
+        bytesNeedDownload: (0, protobuf_msg_1.valOfOptInt)(m.bytesNeedDownload),
+        versionSyncBranch: (0, protobuf_msg_1.valOfOpt)(m.versionSyncBranch),
         ctime: (m.ctime ? new Date((0, protobuf_msg_1.valOfOptInt)(m.ctime)) : undefined),
         mtime: (m.mtime ? new Date((0, protobuf_msg_1.valOfOptInt)(m.mtime)) : undefined),
     };
@@ -468,82 +475,19 @@ var getByteSource;
     getByteSource.makeCaller = makeCaller;
 })(getByteSource || (getByteSource = {}));
 Object.freeze(getByteSource);
-const fileEventType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileEventMsg);
-function packFileEvent(e) {
-    const { type, path } = e;
-    switch (type) {
-        case 'file-change':
-            return fileEventType.pack({
-                type, path,
-                src: (0, protobuf_msg_1.toVal)(e.src),
-                newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion)
-            });
-        case 'removed':
-            return fileEventType.pack({
-                type, path,
-                src: (0, protobuf_msg_1.toVal)(e.src)
-            });
-        case 'remote-change':
-            return fileEventType.pack({
-                type, path, newVersion: (0, protobuf_msg_1.toOptVal)(e.newVersion)
-            });
-        case 'remote-removal':
-            return fileEventType.pack({
-                type, path
-            });
-        case 'remote-arch-ver-removal':
-            return fileEventType.pack({
-                type, path, removedArchVer: (0, protobuf_msg_1.toOptVal)(e.removedArchVer)
-            });
-        case 'remote-version-archival':
-            return fileEventType.pack({
-                type, path, archivedVersion: (0, protobuf_msg_1.toOptVal)(e.archivedVersion)
-            });
-        default:
-            throw new Error(`Unknown event type ${type}`);
-    }
+const stringValueType = protobuf_type_1.ProtoType.for(common_proto_1.common.StringValue);
+function packEvent(e) {
+    return stringValueType.pack((0, protobuf_msg_1.toVal)(JSON.stringify(e)));
 }
-function unpackFileEvent(buf) {
-    const m = fileEventType.unpack(buf);
-    const { type, path } = m;
-    switch (type) {
-        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 unpackEvent(buf) {
+    return JSON.parse(stringValueType.unpack(buf).value);
 }
 var watch;
 (function (watch) {
     function wrapService(fn) {
         return buf => {
             const s = new rxjs_1.Subject();
-            const obs = s.asObservable().pipe((0, operators_1.map)(packFileEvent));
+            const obs = s.asObservable().pipe((0, operators_1.map)(packEvent));
             const onCancel = fn(s);
             return { obs, onCancel };
         };
@@ -555,7 +499,7 @@ var watch;
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, undefined, s);
             s.asObservable()
-                .pipe((0, operators_1.map)(unpackFileEvent))
+                .pipe((0, operators_1.map)(unpackEvent))
                 .subscribe((0, utils_for_observables_1.toRxObserver)(obs));
             return unsub;
         };
@@ -1212,15 +1156,47 @@ function optionsToUploadLocalFromMsg(opts) {
         uploadVersion: (0, protobuf_msg_1.valOfOptInt)(opts.uploadVersion)
     };
 }
+var vsStartUpload;
+(function (vsStartUpload) {
+    vsStartUpload.requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncUploadRequestBody);
+    vsStartUpload.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncStartUploadReplyBody);
+    function wrapService(fn) {
+        return buf => {
+            const { opts } = vsStartUpload.requestType.unpack(buf);
+            const promise = fn(optionsToUploadLocalFromMsg(opts))
+                .then(startedUpload => vsStartUpload.replyType.pack({ startedUpload }));
+            return { promise };
+        };
+    }
+    vsStartUpload.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'startUpload');
+        return opts => caller
+            .startPromiseCall(path, vsStartUpload.requestType.pack({
+            opts: optionsToUploadLocalToMsg(opts)
+        }))
+            .then(buf => {
+            const { startedUpload } = vsStartUpload.replyType.unpack(buf);
+            if (startedUpload) {
+                const { uploadTaskId, uploadVersion } = startedUpload;
+                return {
+                    uploadVersion: (0, protobuf_msg_1.fixInt)(uploadVersion),
+                    uploadTaskId: (0, protobuf_msg_1.fixInt)(uploadTaskId)
+                };
+            }
+        });
+    }
+    vsStartUpload.makeCaller = makeCaller;
+})(vsStartUpload || (exports.vsStartUpload = vsStartUpload = {}));
+Object.freeze(vsStartUpload);
 var vsUpload;
 (function (vsUpload) {
-    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncUploadRequestBody);
-    const replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncUploadReplyBody);
+    vsUpload.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileSyncUploadReplyBody);
     function wrapService(fn) {
         return buf => {
-            const { opts } = requestType.unpack(buf);
+            const { opts } = vsStartUpload.requestType.unpack(buf);
             const promise = fn(optionsToUploadLocalFromMsg(opts))
-                .then(uploadedVersion => replyType.pack({
+                .then(uploadedVersion => vsUpload.replyType.pack({
                 uploadedVersion: (0, protobuf_msg_1.toOptVal)(uploadedVersion)
             }));
             return { promise };
@@ -1230,13 +1206,13 @@ var vsUpload;
     function makeCaller(caller, objPath) {
         const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'upload');
         return opts => caller
-            .startPromiseCall(path, requestType.pack({
+            .startPromiseCall(path, vsStartUpload.requestType.pack({
             opts: optionsToUploadLocalToMsg(opts)
         }))
-            .then(buf => (0, protobuf_msg_1.valOfOptInt)(replyType.unpack(buf).uploadedVersion));
+            .then(buf => (0, protobuf_msg_1.valOfOptInt)(vsUpload.replyType.unpack(buf).uploadedVersion));
     }
     vsUpload.makeCaller = makeCaller;
-})(vsUpload || (vsUpload = {}));
+})(vsUpload || (exports.vsUpload = vsUpload = {}));
 Object.freeze(vsUpload);
 function remoteAdoptionOptsToMsg(opts) {
     if (!opts) {

package/build/core-ipc/fs.js

@@ -110,6 +110,7 @@ function makeFSCaller(caller, fsMsg) {
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.makeCaller(caller, vsPath)
             };
             if (fs.writable) {
+                fs.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
                 fs.v.sync.upload = vsUpload.makeCaller(caller, vsPath);
                 fs.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.makeCaller(caller, vsPath);
             }
@@ -136,8 +137,8 @@ function exposeFSService(fs, expServices) {
         readonlySubRoot: readonlySubRoot.wrapService(fs.readonlySubRoot, expServices),
         select: select.wrapService(fs.select, expServices),
         stat: stat.wrapService(fs.stat),
-        watchFolder: watch.wrapService(fs.watchFolder, packFSEvent),
-        watchFile: watch.wrapService(fs.watchFile, file_1.packFileEvent),
+        watchFolder: watch.wrapService(fs.watchFolder),
+        watchFile: watch.wrapService(fs.watchFile),
         watchTree: watchTree.wrapService(fs.watchTree),
     };
     if (fs.writable) {
@@ -188,6 +189,7 @@ function exposeFSService(fs, expServices) {
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions)
             };
             if (fs.writable) {
+                implExp.v.sync.startUpload = vsStartUpload.wrapService(fs.v.sync.startUpload);
                 implExp.v.sync.upload = vsUpload.wrapService(fs.v.sync.upload);
                 implExp.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.wrapService(fs.v.sync.adoptRemoteFolderItem);
             }
@@ -382,127 +384,6 @@ var readLink;
     readLink.makeCaller = makeCaller;
 })(readLink || (readLink = {}));
 Object.freeze(readLink);
-const fsEventMsgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSEventMsg);
-function packFSEvent(e) {
-    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 { 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,
@@ -530,34 +411,34 @@ function lsEntryFromMsg(m) {
 }
 var watch;
 (function (watch) {
-    function wrapService(fn, packEvent) {
+    function wrapService(fn) {
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
             const s = new rxjs_1.Subject();
-            const obs = s.asObservable().pipe((0, operators_1.map)(packEvent));
+            const obs = s.asObservable().pipe((0, operators_1.map)(file_1.packEvent));
             const onCancel = fn(path, s);
             return { obs, onCancel };
         };
     }
     watch.wrapService = wrapService;
-    function makeCaller(caller, ipcPath, unpackEvent) {
+    function makeCaller(caller, ipcPath) {
         return (path, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(ipcPath, reqWithPathType.pack({ path }), s);
             s.asObservable()
-                .pipe((0, operators_1.map)(unpackEvent))
+                .pipe((0, operators_1.map)(file_1.unpackEvent))
                 .subscribe((0, utils_for_observables_1.toRxObserver)(obs));
             return unsub;
         };
     }
     function makeFolderCaller(caller, objPath) {
         const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'watchFolder');
-        return makeCaller(caller, ipcPath, unpackFSEvent);
+        return makeCaller(caller, ipcPath);
     }
     watch.makeFolderCaller = makeFolderCaller;
     function makeFileCaller(caller, objPath) {
         const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'watchFile');
-        return makeCaller(caller, ipcPath, file_1.unpackFileEvent);
+        return makeCaller(caller, ipcPath);
     }
     watch.makeFileCaller = makeFileCaller;
 })(watch || (watch = {}));
@@ -569,7 +450,7 @@ var watchTree;
         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 obs = s.asObservable().pipe((0, operators_1.map)(file_1.packEvent));
             const onCancel = fn(path, (0, protobuf_msg_1.valOfOpt)(depth), s);
             return { obs, onCancel };
         };
@@ -581,7 +462,7 @@ var watchTree;
             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))
+                .pipe((0, operators_1.map)(file_1.unpackEvent))
                 .subscribe((0, utils_for_observables_1.toRxObserver)(obs));
             return unsub;
         };
@@ -1967,10 +1848,43 @@ var vsDownload;
     vsDownload.makeCaller = makeCaller;
 })(vsDownload || (vsDownload = {}));
 Object.freeze(vsDownload);
+var vsStartUpload;
+(function (vsStartUpload) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSSyncUploadRequestBody);
+    const replyType = file.vsStartUpload.replyType;
+    function wrapService(fn) {
+        return buf => {
+            const { path, opts } = requestType.unpack(buf);
+            const promise = fn(path, file.optionsToUploadLocalFromMsg(opts))
+                .then(startedUpload => replyType.pack({ startedUpload }));
+            return { promise };
+        };
+    }
+    vsStartUpload.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'startUpload');
+        return (path, opts) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, opts: file.optionsToUploadLocalToMsg(opts)
+        }))
+            .then(buf => {
+            const { startedUpload } = replyType.unpack(buf);
+            if (startedUpload) {
+                const { uploadTaskId, uploadVersion } = startedUpload;
+                return {
+                    uploadVersion: (0, protobuf_msg_1.fixInt)(uploadVersion),
+                    uploadTaskId: (0, protobuf_msg_1.fixInt)(uploadTaskId)
+                };
+            }
+        });
+    }
+    vsStartUpload.makeCaller = makeCaller;
+})(vsStartUpload || (vsStartUpload = {}));
+Object.freeze(vsStartUpload);
 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);
+    const replyType = file.vsUpload.replyType;
     function wrapService(fn) {
         return buf => {
             const { path, opts } = requestType.unpack(buf);

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

@@ -89,6 +89,7 @@ function wrapWritableFileSyncAPI(sImpl) {
         status: sImpl.status.bind(sImpl),
         download: sImpl.download.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
+        startUpload: sImpl.startUpload.bind(sImpl),
         upload: sImpl.upload.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
     };
@@ -237,6 +238,7 @@ function wrapWritableFSSyncAPI(sImpl) {
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
         diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
+        startUpload: sImpl.startUpload.bind(sImpl),
         upload: sImpl.upload.bind(sImpl),
         adoptRemoteFolderItem: sImpl.adoptRemoteFolderItem.bind(sImpl),
     };

package/build/lib-client/objs-on-disk/obj-on-disk.d.ts

@@ -40,6 +40,7 @@ export declare class ObjOnDisk {
     };
     private segsThatNeedDownload;
     doesFileNeedDownload(): boolean;
+    numOfBytesNeedingDownload(): number;
     downloadMissingSections(): Promise<void>;
 }
 export interface ObjDownloader {

package/build/lib-client/objs-on-disk/obj-on-disk.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2018 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2018 - 2020, 2022, 2025 3NSoft Inc.
 
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -200,6 +200,13 @@ class ObjOnDisk {
     doesFileNeedDownload() {
         return (this.segsThatNeedDownload().length === 0);
     }
+    numOfBytesNeedingDownload() {
+        let totalLen = 0;
+        for (const { len } of this.segsThatNeedDownload()) {
+            totalLen += len;
+        }
+        return totalLen;
+    }
     async downloadMissingSections() {
         const needDownload = this.segsThatNeedDownload();
         for (const chunk of needDownload) {

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

@@ -1,9 +1,9 @@
-import { ScryptGenParams } from '../key-derivation';
-import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
-import { Observable } from 'rxjs';
-import { LogError } from '../logging/log-to-file';
-export { AsyncSBoxCryptor } from 'xsp-files';
-export { FolderInJSON } from './folder-node';
+import type { ScryptGenParams } from '../key-derivation';
+import type { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
+import type { Observable } from 'rxjs';
+import type { LogError } from '../logging/log-to-file';
+export type { AsyncSBoxCryptor } from 'xsp-files';
+export type { FolderInJSON } from './folder-node';
 type StorageType = web3n.files.FSType;
 type FolderEvent = web3n.files.FolderEvent;
 type FileEvent = web3n.files.FileEvent;
@@ -12,6 +12,7 @@ type SyncStatus = web3n.files.SyncStatus;
 type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 type FSSyncException = web3n.files.FSSyncException;
 type FileException = web3n.files.FileException;
+type UploadEvent = web3n.files.UploadEvent;
 export type FSChangeSrc = web3n.files.FSChangeEvent['src'];
 export interface Node {
     objId: string;
@@ -20,18 +21,6 @@ export interface Node {
 }
 export type NodeType = 'file' | 'link' | 'folder';
 export type ObjId = string | null;
-/**
- * This is a container for file system nodes.
- *
- * Current implementation performs two functions: container for nodes, and a
- * provider of node type, corresponding to given object.
- * The later function, used by synced storage for conflict resolution, takes
- * advantage of container not forgeting nodes, like cache may do.
- * So, at least for local storage's sake, this container may be refactored to
- * act more like cache, and even then we shouldn't forget about cascading keys
- * and a need to keep parent nodes in memory, while child nodes are in
- * use/cache.
- */
 export declare class NodesContainer {
     private nodes;
     private promises;
@@ -51,7 +40,7 @@ export interface NodeEvent {
     objId: ObjId;
     parentObjId?: ObjId;
     childObjId?: ObjId;
-    event: FolderEvent | FileEvent | RemoteEvent;
+    event: FolderEvent | FileEvent | RemoteEvent | UploadEvent;
 }
 export interface Storage {
     readonly type: StorageType;
@@ -113,13 +102,16 @@ export interface SyncedStorage extends Storage {
     getRootKeyDerivParamsFromServer(): Promise<ScryptGenParams>;
     adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
     updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
-    isObjOnDisk(objId: ObjId): Promise<boolean>;
     isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'partial' | 'complete' | 'none'>;
     download(objId: ObjId, version: number): Promise<void>;
-    upload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean): Promise<void>;
+    startUpload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean, eventSink: (event: UploadEvent) => void): Promise<{
+        uploadTaskId: number;
+        completion: Promise<void>;
+    }>;
     dropCachedLocalObjVersionsLessOrEqual(objId: ObjId, localVersion: number): void;
     uploadObjRemoval(objId: ObjId): Promise<void>;
     status(objId: ObjId): Promise<SyncedObjStatus>;
+    getNumOfBytesNeedingDownload(objId: ObjId, version: number): Promise<number | 'unknown'>;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
 }

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

@@ -21,18 +21,6 @@ exports.wrapStorageImplementation = wrapStorageImplementation;
 exports.wrapSyncStorageImplementation = wrapSyncStorageImplementation;
 exports.isSyncedStorage = isSyncedStorage;
 exports.setPathInExc = setPathInExc;
-/**
- * This is a container for file system nodes.
- *
- * Current implementation performs two functions: container for nodes, and a
- * provider of node type, corresponding to given object.
- * The later function, used by synced storage for conflict resolution, takes
- * advantage of container not forgeting nodes, like cache may do.
- * So, at least for local storage's sake, this container may be refactored to
- * act more like cache, and even then we shouldn't forget about cascading keys
- * and a need to keep parent nodes in memory, while child nodes are in
- * use/cache.
- */
 class NodesContainer {
     constructor() {
         this.nodes = new Map();
@@ -125,23 +113,23 @@ function wrapSyncStorageImplementation(impl) {
     for (const [field, value] of Object.entries(storageWrap)) {
         wrap[field] = value;
     }
-    wrap.getRootKeyDerivParamsFromServer =
-        impl.getRootKeyDerivParamsFromServer.bind(impl);
+    wrap.getRootKeyDerivParamsFromServer = impl.getRootKeyDerivParamsFromServer.bind(impl);
     wrap.getObjSrcOfRemoteVersion = impl.getObjSrcOfRemoteVersion.bind(impl);
     wrap.archiveVersionOnServer = impl.archiveVersionOnServer.bind(impl);
     wrap.isRemoteVersionOnDisk = impl.isRemoteVersionOnDisk.bind(impl);
     wrap.download = impl.download.bind(impl);
-    wrap.upload = impl.upload.bind(impl);
+    wrap.startUpload = impl.startUpload.bind(impl);
     wrap.uploadObjRemoval = impl.uploadObjRemoval.bind(impl);
     wrap.dropCachedLocalObjVersionsLessOrEqual = impl.dropCachedLocalObjVersionsLessOrEqual.bind(impl);
     wrap.adoptRemote = impl.adoptRemote.bind(impl);
     wrap.updateStatusInfo = impl.updateStatusInfo.bind(impl);
     wrap.suspendNetworkActivity = impl.suspendNetworkActivity.bind(impl);
     wrap.resumeNetworkActivity = impl.resumeNetworkActivity.bind(impl);
+    wrap.getNumOfBytesNeedingDownload = impl.getNumOfBytesNeedingDownload.bind(impl);
     return Object.freeze(wrap);
 }
 function isSyncedStorage(storage) {
-    return !!storage.upload;
+    return !!storage.startUpload;
 }
 function setPathInExc(exc, path) {
     if ((exc.type === 'fs-sync') || (exc.type === 'file')) {