core-3nweb-client-lib 0.43.9 → 0.43.12

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

@@ -412,7 +412,7 @@ declare namespace web3n.files {
 		 */
 		getByteSource(): Promise<FileByteSource>;
 
-		watch(observer: Observer<FileEvent|RemoteEvent|UploadEvent>): () => void;
+		watch(observer: Observer<FileEvent|RemoteEvent|UploadEvent|DownloadEvent>): () => void;
 
 	}
 
@@ -638,7 +638,7 @@ declare namespace web3n.files {
 		 * This downloads bytes onto disk, skipping decryption, as file content isn't read here.
 		 * @param version 
 		 */
-		download(version: number): Promise<void>;
+		startDownload(version: number): Promise<{ downloadTaskId: number; }|undefined>;
 
 		/**
 		 * Adopts remote version.
@@ -665,7 +665,7 @@ declare namespace web3n.files {
 		 * Undefined is returned when upload is not needed, e.g. version is already synced.
 		 * Upload version and upload task id are returned together with an indicator of whether
 		 * this call has started upload, or it has already been going on.
-		 * Upload task id can be used to watch upload process.
+		 * Upload task id can be used to filter watched events.
 		 * @param opts 
 		 */
 		startUpload(
@@ -674,6 +674,7 @@ declare namespace web3n.files {
 
 		/**
 		 * Upload in conflicting and behind state of sync requires explicit upload version.
+		 * This upload will not be generating upload events.
 		 * @param opts 
 		 */
 		upload(opts?: OptionsToUploadLocal): Promise<number|undefined>;
@@ -763,16 +764,16 @@ declare namespace web3n.files {
 		readLink(path: string): Promise<SymLink>;
 
 		watchFolder(
-			path: string, observer: Observer<FolderEvent|RemoteEvent|UploadEvent>
+			path: string, observer: Observer<FolderEvent|RemoteEvent|UploadEvent|DownloadEvent>
 		): () => void;
 
 		watchFile(
-			path: string, observer: Observer<FileEvent|RemoteEvent|UploadEvent>
+			path: string, observer: Observer<FileEvent|RemoteEvent|UploadEvent|DownloadEvent>
 		): () => void;
 
 		watchTree(
 			path: string, depth: number|undefined,
-			observer: Observer<FolderEvent|FileEvent|RemoteEvent|UploadEvent>
+			observer: Observer<FolderEvent|FileEvent|RemoteEvent|UploadEvent|DownloadEvent>
 		): () => void;
 
 		close(): Promise<void>;
@@ -1288,7 +1289,7 @@ declare namespace web3n.files {
 		 * @param path 
 		 * @param version 
 		 */
-		download(path: string, version: number): Promise<void>;
+		startDownload(path: string, version: number): Promise<{ downloadTaskId: number; }|undefined>;
 
 		/**
 		 * Adopts remote version of fs object at given path.
@@ -1340,7 +1341,7 @@ declare namespace web3n.files {
 		 * Undefined is returned when upload is not needed, e.g. version is already synced.
 		 * Upload version and upload task id are returned together with an indicator of whether
 		 * this call has started upload, or it has already been going on.
-		 * Upload task id can be used to watch upload process.
+		 * Upload task id can be used to filter watched events.
 		 * @param path 
 		 * @param opts 
 		 */
@@ -1350,6 +1351,7 @@ declare namespace web3n.files {
 
 		/**
 		 * Upload in conflicting and behind state of sync requires explicit upload version.
+		 * This upload will not be generating upload events.
 		 * @param path 
 		 * @param opts 
 		 */
@@ -1470,4 +1472,26 @@ declare namespace web3n.files {
 		type: 'upload-done';
 	}
 
+	type DownloadEvent = DownloadStartEvent | DownloadProgressEvent | DownloadDoneEvent;
+
+	interface DownloadEventBase extends FSEvent {
+		downloadTaskId: number;
+		version: number;
+	}
+
+	interface DownloadStartEvent extends DownloadEventBase {
+		type: 'download-started';
+		totalBytesToDownload: number;
+	}
+
+	interface DownloadDoneEvent extends DownloadEventBase {
+		type: 'download-done';
+	}
+
+	interface DownloadProgressEvent extends DownloadEventBase {
+		type: 'download-progress';
+		totalBytesToDownload: number;
+		bytesLeftToDownload: number;
+	}
+
 }

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

@@ -56,6 +56,8 @@ declare namespace web3n {
 	interface HTTPException extends HTTPErrorDetails {
 		type: 'http-request';
 		status: number;
+		malformedResponse?: true;
+		unexpectedStatus?: true;
 	}
 
 	interface ServLocException extends RuntimeException {

package/build/core/asmail/inbox/index.js

@@ -110,7 +110,7 @@ class InboxOnServer {
             return msgOnDisk;
         }
         const meta = await this.downloader.getMsgMeta(msgId);
-        return this.cache.addMsg(msgId, meta);
+        return await this.cache.addMsg(msgId, meta);
     }
     async startCachingAndAddKeyToIndex(msgId) {
         const msgOnDisk = await this.msgFromDiskOrDownload(msgId);

package/build/core/asmail/inbox/msg-downloader.d.ts

@@ -1,20 +1,10 @@
 import { MailRecipient } from "../../../lib-client/asmail/recipient";
 import { ObjDownloader } from "../../../lib-client/objs-on-disk/obj-on-disk";
 import { MsgMeta } from "../../../lib-common/service-api/asmail/retrieval";
-/**
- * Downloader is responsible for getting mail objects from server and placing
- * bytes into cache.
- */
 export declare class MsgDownloader {
-    private msgReceiver;
-    /**
-     * Per-object chained downloads.
-     * When it comes to the download start, if chain exists, it means that
-     * process has already started.
-     */
-    private downloadProcs;
+    private readonly msgReceiver;
+    private readonly runner;
     constructor(msgReceiver: MailRecipient);
-    private sync;
     getMsgMeta(msgId: string): Promise<MsgMeta>;
     getObjDownloader(msgId: string): ObjDownloader;
     private getLayoutWithHeaderAndFirstSegs;

package/build/core/asmail/inbox/msg-downloader.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2019 3NSoft Inc.
+ Copyright (C) 2016 - 2019, 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
@@ -13,72 +13,39 @@
  See the GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgDownloader = void 0;
-const synced_1 = require("../../../lib-common/processes/synced");
-const buffer_utils_1 = require("../../../lib-common/buffer-utils");
+const obj_on_disk_1 = require("../../../lib-client/objs-on-disk/obj-on-disk");
 const MAX_GETTING_CHUNK = 512 * 1024;
 const DOWNLOAD_START_CHUNK = 128 * 1024;
-/**
- * Downloader is responsible for getting mail objects from server and placing
- * bytes into cache.
- */
 class MsgDownloader {
     constructor(msgReceiver) {
         this.msgReceiver = msgReceiver;
-        /**
-         * Per-object chained downloads.
-         * When it comes to the download start, if chain exists, it means that
-         * process has already started.
-         */
-        this.downloadProcs = new synced_1.NamedProcs();
+        this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.freeze(this);
     }
-    async sync(msgId, objId, action) {
-        const id = `${msgId}/${objId}`;
-        return this.downloadProcs.startOrChain(id, action);
-    }
     getMsgMeta(msgId) {
-        return this.sync(msgId, null, () => this.msgReceiver.getMsgMeta(msgId));
+        return this.msgReceiver.getMsgMeta(msgId);
     }
     getObjDownloader(msgId) {
         return {
-            getLayoutWithHeaderAndFirstSegs: objId => this.getLayoutWithHeaderAndFirstSegs(msgId, objId),
-            getSegs: (objId, v, start, end) => this.getSegs(msgId, objId, start, end)
+            getLayoutWithHeaderAndFirstSegs: (objId, v) => this.getLayoutWithHeaderAndFirstSegs(msgId, objId),
+            getSegs: (objId, v, start, end) => this.getSegs(msgId, objId, start, end),
+            splitSegsDownloads: (start, end) => (0, obj_on_disk_1.splitSegsDownloads)(start, end, MAX_GETTING_CHUNK),
+            schedule: this.runner.schedule.bind(this.runner)
         };
     }
     async getLayoutWithHeaderAndFirstSegs(msgId, objId) {
-        if (!objId) {
-            throw new Error(`Message object cannot be null`);
-        }
-        const { header, segsChunk, segsTotalLen } = await this.sync(msgId, objId, () => this.msgReceiver.getObj(msgId, objId, DOWNLOAD_START_CHUNK));
+        const { header, segsChunk, segsTotalLen } = await this.msgReceiver.getObj(msgId, objId, DOWNLOAD_START_CHUNK);
         const layout = {
             sections: [{ src: 'new', ofs: 0, len: segsTotalLen }]
         };
         return { header, segs: segsChunk, layout };
     }
-    async getSegs(msgId, objId, start, end) {
-        if (!objId) {
-            throw new Error(`Message object cannot have null id`);
-        }
-        return this.sync(msgId, objId, async () => {
-            if ((end - start) < MAX_GETTING_CHUNK) {
-                const allBytes = await this.msgReceiver.getObjSegs(msgId, objId, start, end);
-                return allBytes;
-            }
-            else {
-                const chunks = [];
-                let ofs = start;
-                while (ofs < end) {
-                    const len = Math.min(end - ofs, MAX_GETTING_CHUNK);
-                    const chunk = await this.msgReceiver.getObjSegs(msgId, objId, ofs, ofs + len);
-                    chunks.push(chunk);
-                    ofs += chunk.length;
-                }
-                return (0, buffer_utils_1.joinByteArrs)(chunks);
-            }
-        });
+    getSegs(msgId, objId, start, end) {
+        return this.msgReceiver.getObjSegs(msgId, objId, start, end);
     }
 }
 exports.MsgDownloader = MsgDownloader;

package/build/core/storage/synced/downloader.d.ts

@@ -1,25 +1,16 @@
 import { StorageOwner } from '../../../lib-client/3nstorage/storage-owner';
 import { ObjId } from '../../../lib-client/xsp-fs/common';
-import { ObjDownloader, InitDownloadParts } from '../../../lib-client/objs-on-disk/obj-on-disk';
-import { Layout } from 'xsp-files';
+import { ObjDownloader, InitDownloadParts, Section, Download } from '../../../lib-client/objs-on-disk/obj-on-disk';
 export declare class Downloader implements ObjDownloader {
-    private remoteStorage;
-    /**
-     * Per-object chained downloads.
-     * When it comes to the download start, if chain exists, it means that
-     * process has already started.
-     */
-    private downloadProcs;
+    private readonly remoteStorage;
+    private readonly runner;
     constructor(remoteStorage: StorageOwner);
-    private sync;
-    getLayoutWithHeaderAndFirstSegs(objId: ObjId, version: number): Promise<{
-        layout: Layout;
-        header: Uint8Array;
-        segs?: Uint8Array;
-    }>;
+    getLayoutWithHeaderAndFirstSegs(objId: ObjId, version: number): Promise<InitDownloadParts>;
+    schedule(download: Download): void;
     getSegs(objId: ObjId, version: number, start: number, end: number): Promise<Uint8Array>;
     getCurrentObjVersion(objId: ObjId): Promise<{
         version: number;
         parts: InitDownloadParts;
     }>;
+    splitSegsDownloads(start: number, end: number): Section[];
 }

package/build/core/storage/synced/downloader.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2019 3NSoft Inc.
+ Copyright (C) 2016 - 2019, 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
@@ -17,65 +17,42 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Downloader = void 0;
-const synced_1 = require("../../../lib-common/processes/synced");
-const buffer_utils_1 = require("../../../lib-common/buffer-utils");
+const obj_on_disk_1 = require("../../../lib-client/objs-on-disk/obj-on-disk");
 const MAX_GETTING_CHUNK = 512 * 1024;
 const DOWNLOAD_START_CHUNK = 128 * 1024;
 class Downloader {
     constructor(remoteStorage) {
         this.remoteStorage = remoteStorage;
-        /**
-         * Per-object chained downloads.
-         * When it comes to the download start, if chain exists, it means that
-         * process has already started.
-         */
-        this.downloadProcs = new synced_1.NamedProcs();
+        this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.seal(this);
     }
-    async sync(objId, version, action) {
-        const id = `${objId}/${version}`;
-        return this.downloadProcs.startOrChain(id, action);
+    async getLayoutWithHeaderAndFirstSegs(objId, version) {
+        const { header, segsTotalLen, version: currentVersion, segsChunk } = await this.remoteStorage.getCurrentObj(objId, DOWNLOAD_START_CHUNK);
+        // XXX this gets current version, but it will have to change to getting
+        // just version. It will be seen, if version's state needs passing.
+        if (currentVersion !== version) {
+            throw new Error(`Current version on server is ${currentVersion} while request was for ${version}`);
+        }
+        const layout = {
+            sections: [{ src: 'new', ofs: 0, len: segsTotalLen }]
+        };
+        return { header, segs: segsChunk, layout };
     }
-    getLayoutWithHeaderAndFirstSegs(objId, version) {
-        return this.sync(objId, version, async () => {
-            // XXX this gets current version, but it will have to change to getting
-            // just version. It will be seen, if version's state needs passing.
-            const { header, segsTotalLen, version, segsChunk } = await this.remoteStorage.getCurrentObj(objId, DOWNLOAD_START_CHUNK);
-            const layout = {
-                sections: [{ src: 'new', ofs: 0, len: segsTotalLen }]
-            };
-            return { header, segs: segsChunk, layout };
-        });
+    schedule(download) {
+        this.runner.schedule(download);
     }
     getSegs(objId, version, start, end) {
-        // XXX this gets current version, but it will have to change to getting
-        // just version. It will be seen, if version's state needs passing.
-        return this.sync(objId, version, async () => {
-            if ((end - start) < MAX_GETTING_CHUNK) {
-                const allBytes = await this.remoteStorage.getCurrentObjSegs(objId, version, start, end);
-                return allBytes;
-            }
-            else {
-                const chunks = [];
-                let ofs = start;
-                while (ofs < end) {
-                    const len = Math.min(end - ofs, MAX_GETTING_CHUNK);
-                    const chunk = await this.remoteStorage.getCurrentObjSegs(objId, version, ofs, ofs + len);
-                    chunks.push(chunk);
-                    ofs += chunk.length;
-                }
-                return (0, buffer_utils_1.joinByteArrs)(chunks);
-            }
-        });
+        return this.remoteStorage.getCurrentObjSegs(objId, version, start, end);
     }
     async getCurrentObjVersion(objId) {
-        return await this.sync(objId, -1, async () => {
-            const { header, segsTotalLen, version, segsChunk } = await this.remoteStorage.getCurrentObj(objId, DOWNLOAD_START_CHUNK);
-            const layout = {
-                sections: [{ src: 'new', ofs: 0, len: segsTotalLen }]
-            };
-            return { version, parts: { header, segs: segsChunk, layout } };
-        });
+        const { header, segsTotalLen, version, segsChunk: segs } = await this.remoteStorage.getCurrentObj(objId, DOWNLOAD_START_CHUNK);
+        const layout = {
+            sections: [{ src: 'new', ofs: 0, len: segsTotalLen }]
+        };
+        return { version, parts: { header, segs, layout } };
+    }
+    splitSegsDownloads(start, end) {
+        return (0, obj_on_disk_1.splitSegsDownloads)(start, end, MAX_GETTING_CHUNK);
     }
 }
 exports.Downloader = Downloader;

package/build/core/storage/synced/obj-files.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ObjId, SyncedObjStatus } from '../../../lib-client/xsp-fs/common';
+import { DownloadEventSink, ObjId, SyncedObjStatus } from '../../../lib-client/xsp-fs/common';
 import { InitDownloadParts } from '../../../lib-client/objs-on-disk/obj-on-disk';
 import { ObjSource, Subscribe } from 'xsp-files';
 import { Downloader } from './downloader';
@@ -91,5 +91,7 @@ export declare class SyncedObj {
     recordRemovalUploadAndGC(): Promise<void>;
     isRemoteVersionOnDisk(version: number): Promise<'complete' | 'partial' | 'none'>;
     getNumOfBytesNeedingDownload(version: number): Promise<number | 'unknown'>;
-    downloadRemoteVersion(version: number): Promise<void>;
+    startDownloadProcess(version: number, eventSink: DownloadEventSink): Promise<{
+        downloadTaskId: number;
+    } | undefined>;
 }

package/build/core/storage/synced/obj-files.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2016 - 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
@@ -128,9 +128,8 @@ class ObjFiles {
     //     Should it be a pattern: version not in status -> get info first.
     async makeByDownloadingCurrentVersion(objId) {
         // initial download implicitly checks existence of obj on server
-        const download = await this.downloader.getCurrentObjVersion(objId);
-        const obj = await this.makeObj(objId, download);
-        return obj;
+        const initDownload = await this.downloader.getCurrentObjVersion(objId);
+        return await this.makeObj(objId, initDownload);
     }
     async saveFirstVersion(objId, encSub) {
         const newObj = await this.makeObj(objId);
@@ -406,7 +405,7 @@ class SyncedObj {
             return 'none';
         }
         const objVer = await this.instanceOfRemoteObjVer(version);
-        return (objVer.doesFileNeedDownload() ? 'complete' : 'partial');
+        return (objVer.doesFileNeedDownload() ? 'partial' : 'complete');
     }
     async getNumOfBytesNeedingDownload(version) {
         if (!this.status.isAmongRemote(version)) {
@@ -424,9 +423,10 @@ class SyncedObj {
         const objVer = await this.instanceOfRemoteObjVer(version);
         return objVer.numOfBytesNeedingDownload();
     }
-    async downloadRemoteVersion(version) {
+    async startDownloadProcess(version, eventSink) {
         const objVer = await this.instanceOfRemoteObjVer(version);
-        await objVer.downloadMissingSections();
+        const downloadTaskId = objVer.startDownloadInBackground(eventSink);
+        return (downloadTaskId ? { downloadTaskId } : undefined);
     }
 }
 exports.SyncedObj = SyncedObj;

package/build/core/storage/synced/storage.d.ts

@@ -1,5 +1,5 @@
 import { IGetMailerIdSigner } from '../../../lib-client/user-with-mid-session';
-import { SyncedStorage as ISyncedStorage, NodesContainer, Storage as IStorage, StorageGetter, ObjId, NodeEvent, SyncedObjStatus } from '../../../lib-client/xsp-fs/common';
+import { SyncedStorage as ISyncedStorage, NodesContainer, Storage as IStorage, StorageGetter, ObjId, NodeEvent, SyncedObjStatus, DownloadEventSink } from '../../../lib-client/xsp-fs/common';
 import { ScryptGenParams } from '../../../lib-client/key-derivation';
 import { LogError } from '../../../lib-client/logging/log-to-file';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
@@ -39,7 +39,9 @@ export declare class SyncedStore implements ISyncedStorage {
     adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
     updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
     isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'complete' | 'partial' | 'none'>;
-    download(objId: ObjId, version: number): Promise<void>;
+    startDownload(objId: ObjId, version: number, eventSink: DownloadEventSink): Promise<{
+        downloadTaskId: number;
+    } | undefined>;
     startUpload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean, eventSink: (event: UploadEvent) => void): Promise<{
         uploadTaskId: number;
         completion: Promise<void>;

package/build/core/storage/synced/storage.js

@@ -118,9 +118,9 @@ class SyncedStore {
         const obj = await this.getObjOrThrow(objId, true);
         return obj.isRemoteVersionOnDisk(version);
     }
-    async download(objId, version) {
+    async startDownload(objId, version, eventSink) {
         const obj = await this.getObjOrThrow(objId, true);
-        return obj.downloadRemoteVersion(version);
+        return obj.startDownloadProcess(version, eventSink);
     }
     async startUpload(objId, localVersion, uploadVersion, uploadHeader, createOnRemote, eventSink) {
         const obj = await this.getObjOrThrow(objId, true);

package/build/core/storage/synced/upsyncer.d.ts

@@ -4,8 +4,7 @@ import { MonoTypeOperatorFunction } from "rxjs";
 import { FileWrite } from "../../../lib-client/objs-on-disk/file-writing-proc";
 import { LogError } from "../../../lib-client/logging/log-to-file";
 import { NewVersionUpload } from "./obj-status";
-import { UploadHeaderChange } from "../../../lib-client/xsp-fs/common";
-type UploadEvent = web3n.files.UploadEvent;
+import { UploadEventSink, UploadHeaderChange } from "../../../lib-client/xsp-fs/common";
 export type FileWriteTapOperator = MonoTypeOperatorFunction<FileWrite[]>;
 export declare class UpSyncer {
     private readonly remoteStorage;
@@ -23,7 +22,7 @@ export declare class UpSyncer {
      */
     tapFileWrite(obj: SyncedObj, isNew: boolean, newVersion: number, baseVersion?: number): FileWriteTapOperator;
     removeCurrentVersionOf(obj: SyncedObj): Promise<void>;
-    startUploadFromDisk(obj: SyncedObj, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean, eventSink: (event: UploadEvent) => void): Promise<{
+    startUploadFromDisk(obj: SyncedObj, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean, eventSink: UploadEventSink | undefined): Promise<{
         completion: Promise<void>;
         uploadTaskId: number;
     }>;
@@ -33,4 +32,3 @@ export interface UploadStatusRecorder {
     recordUploadCancellation(info: NewVersionUpload): Promise<void>;
     recordUploadInterimState(info: NewVersionUpload): Promise<void>;
 }
-export {};

package/build/core/storage/synced/upsyncer.js

@@ -88,7 +88,7 @@ class UpSyncer {
             if (uploadHeader) {
                 await obj.saveUploadHeaderFile(uploadHeader);
             }
-            const task = await UploadTask.for(obj, localVersion, uploadVersion, uploadHeader === null || uploadHeader === void 0 ? void 0 : uploadHeader.uploadHeader, syncedBase, createOnRemote, uploadTaskId, eventSink, this.remoteStorage, this.execPools, async () => {
+            const task = await UploadTask.for(obj, localVersion, uploadVersion, uploadHeader === null || uploadHeader === void 0 ? void 0 : uploadHeader.uploadHeader, syncedBase, createOnRemote, uploadTaskId, eventSink, this.remoteStorage, async () => {
                 if (this.tasksByIds.delete(task.taskId)) {
                     this.tasksByObjIds.delete(task.objId);
                 }
@@ -113,13 +113,12 @@ exports.UpSyncer = UpSyncer;
 Object.freeze(UpSyncer.prototype);
 Object.freeze(UpSyncer);
 class UploadTask {
-    constructor(taskId, remoteStorage, objId, objStatus, src, execPools, info, uploadHeader, doAtCompletion, eventSink) {
+    constructor(taskId, remoteStorage, objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink) {
         this.taskId = taskId;
         this.remoteStorage = remoteStorage;
         this.objId = objId;
         this.objStatus = objStatus;
         this.src = src;
-        this.execPools = execPools;
         this.info = info;
         this.uploadHeader = uploadHeader;
         this.doAtCompletion = doAtCompletion;
@@ -130,7 +129,7 @@ class UploadTask {
         this.emitUploadEvent('upload-started', { totalBytesToUpload: this.totalBytesToUpload });
         Object.seal(this);
     }
-    static async for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createObj, taskId, eventSink, remoteStorage, execPools, doAtCompletion) {
+    static async for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createObj, taskId, eventSink, remoteStorage, doAtCompletion) {
         const src = await obj.getObjSrcFromLocalAndSyncedBranch(localVersion);
         let needUpload;
         if (syncedBase) {
@@ -149,7 +148,7 @@ class UploadTask {
         };
         const objStatus = obj.statusObj();
         await objStatus.recordUploadStart(info);
-        return new UploadTask(taskId, remoteStorage, obj.objId, objStatus, src, execPools, info, uploadHeader, doAtCompletion, eventSink);
+        return new UploadTask(taskId, remoteStorage, obj.objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink);
     }
     neededExecutor() {
         return (!this.info.needUpload ? undefined : this.execLabel);
@@ -158,7 +157,8 @@ class UploadTask {
         return this.uploadCompletion.promise;
     }
     emitUploadEvent(type, fields) {
-        this.eventSink({
+        var _a;
+        (_a = this.eventSink) === null || _a === void 0 ? void 0 : _a.call(this, {
             type,
             localVersion: this.info.localVersion,
             uploadTaskId: this.taskId,
@@ -169,7 +169,7 @@ class UploadTask {
     }
     async process() {
         if (!this.info.needUpload) {
-            return;
+            return true;
         }
         try {
             const upload = this.info.needUpload;
@@ -194,17 +194,22 @@ class UploadTask {
             }
             await this.objStatus.recordUploadInterimState(this.info);
             if (this.info.needUpload) {
-                this.emitUploadEvent('upload-progress', {
-                    totalBytesToUpload: this.totalBytesToUpload,
-                    bytesLeftToUpload: (0, obj_status_1.countBytesIn)(this.info)
-                });
-                this.execPools.add(this);
+                if (this.eventSink) {
+                    this.emitUploadEvent('upload-progress', {
+                        totalBytesToUpload: this.totalBytesToUpload,
+                        bytesLeftToUpload: (0, obj_status_1.countBytesIn)(this.info)
+                    });
+                }
+                return false;
             }
             else {
                 await this.doAtCompletion().finally(() => {
                     this.uploadCompletion.resolve();
-                    this.emitUploadEvent('upload-done', {});
+                    if (this.eventSink) {
+                        this.emitUploadEvent('upload-done', {});
+                    }
                 });
+                return true;
             }
         }
         catch (exc) {
@@ -215,6 +220,7 @@ class UploadTask {
                 cause: exc
             }));
             await this.objStatus.recordUploadCancellation(this.info);
+            return true;
         }
     }
     async startOrderedUpload(upload) {

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

@@ -3,6 +3,7 @@ import { ProtoType } from '../lib-client/protobuf-type';
 import { ExposedFn, EnvelopeBody, Caller, CoreSideServices } from "../ipc-via-protobuf/connector";
 type ReadonlyFile = web3n.files.ReadonlyFile;
 type ReadonlyFileVersionedAPI = web3n.files.ReadonlyFileVersionedAPI;
+type ReadonlyFileSyncAPI = web3n.files.ReadonlyFileSyncAPI;
 type WritableFile = web3n.files.WritableFile;
 type WritableFileVersionedAPI = web3n.files.WritableFileVersionedAPI;
 type WritableFileSyncAPI = web3n.files.WritableFileSyncAPI;
@@ -147,6 +148,15 @@ export declare namespace vGetByteSink {
     function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: CoreSideServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): WritableFileVersionedAPI['getByteSink'];
 }
+export declare namespace vsStartDownload {
+    const replyType: ProtoType<{
+        startedDownload?: {
+            downloadTaskId: number;
+        };
+    }>;
+    function wrapService(fn: ReadonlyFileSyncAPI['startDownload']): ExposedFn;
+    function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileSyncAPI['startDownload'];
+}
 export interface OptionsToUploadLocalMsg {
     localVersion?: Value<number>;
     uploadVersion?: Value<number>;