core-3nweb-client-lib 0.44.4 → 0.44.6

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

@@ -675,6 +675,7 @@ declare namespace web3n.files {
 
 	interface OptionsToDiffFileVersions {
 		remoteVersion?: number;
+		// XXX implicit assumption that mtime changes only when file content changes
 		compareContentIfSameMTime?: boolean;
 	}
 
@@ -1200,7 +1201,7 @@ declare namespace web3n.files {
 		syncStatus: SyncStatus;
 	}
 
-	type UploadEvent = UploadStartEvent | UploadProgressEvent | UploadDoneEvent;
+	type UploadEvent = UploadStartEvent | UploadProgressEvent | UploadDisconnectedEvent | UploadDoneEvent;
 
 	interface UploadEventBase extends FSEvent {
 		uploadTaskId: number;
@@ -1219,6 +1220,10 @@ declare namespace web3n.files {
 		bytesLeftToUpload: number;
 	}
 
+	interface UploadDisconnectedEvent extends UploadEventBase {
+		type: 'upload-disconnected';
+	}
+
 	interface UploadDoneEvent extends UploadEventBase {
 		type: 'upload-done';
 	}
@@ -1493,6 +1498,12 @@ declare namespace web3n.files {
 		 */
 		getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
 
+		// compareLocalAndRemoteFileItems(path: string, itemName: string, remoteVersion?: number): Promise<FileDiff>;
+
+		// compareLocalAndRemoteFolderItems(
+		// 	path: string, itemName: string, remoteVersion?: number
+		// ): Promise<FolderContentDiff>;
+
 		// XXX method to work around damaged files
 		// reloadFromServer(path: string): Promise<SyncStatus>;
 
@@ -1631,6 +1642,13 @@ declare namespace web3n.files {
 		};
 	}
 
+	// interface FolderContentDiff extends CommonDiff {
+	// 	local: ({
+
+	// 	} & ListingEntry)[];
+	// 	remote: ({} & ListingEntry)[];
+	// }
+
 	interface WritableFSSyncAPI extends ReadonlyFSSyncAPI {
 
 		/**

package/build/core/asmail/inbox/inbox-events.d.ts

@@ -31,8 +31,10 @@ export declare class InboxEvents {
     readonly connectionEvent$: Observable<InboxConnectionStatus>;
     private readonly wsProc;
     private disconnectedAt;
+    private connection;
     constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, listNewMsgs: (fromTS: number) => Promise<MsgInfo[]>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
     private makeProc;
+    whenConnected(): Promise<void>;
     private getMessage;
     subscribe<T>(event: InboxEventType, observer: Observer<T>): () => void;
     close(): void;

package/build/core/asmail/inbox/inbox-events.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019, 2022, 2024 - 2025 3NSoft Inc.
+ Copyright (C) 2017, 2019, 2022, 2024 - 2026 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
@@ -22,6 +22,7 @@ const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
 const operators_1 = require("rxjs/operators");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
+const awaitable_state_1 = require("../../../lib-common/awaitable-state");
 function toInboxConnectionStatus(status, params) {
     return (0, ws_ipc_1.addToStatus)(status, {
         service: 'inbox',
@@ -52,6 +53,7 @@ class InboxEvents {
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
         this.disconnectedAt = undefined;
+        this.connection = new awaitable_state_1.AwaitableState();
         this.wsProc = new ws_ipc_1.WebSocketListening(SERVER_EVENTS_RESTART_WAIT_SECS, this.makeProc.bind(this));
         this.wsProc.startListening();
         Object.seal(this);
@@ -60,7 +62,15 @@ class InboxEvents {
         const proc$ = (0, rxjs_1.from)(this.msgReceiver.openEventSource().then(({ client, heartbeat }) => {
             const channel = retrieval_1.msgRecievedCompletely.EVENT_NAME;
             heartbeat.subscribe({
-                next: ev => this.connectionEvents.next(toInboxConnectionStatus(ev))
+                next: ev => {
+                    this.connectionEvents.next(toInboxConnectionStatus(ev));
+                    if (ev.type === 'heartbeat') {
+                        this.connection.setState();
+                    }
+                    else if ((ev.type === 'heartbeat-skip') || (ev.type === 'disconnected')) {
+                        this.connection.clearState();
+                    }
+                }
             });
             return new rxjs_1.Observable(obs => client.subscribe(channel, obs));
         }))
@@ -76,6 +86,9 @@ class InboxEvents {
         this.listMsgsFromDisconnectedPeriod();
         return proc$;
     }
+    async whenConnected() {
+        return this.connection.whenStateIsSet();
+    }
     async getMessage(msgId) {
         try {
             return await this.getMsg(msgId);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2020, 2022, 2025 - 2026 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
@@ -58,12 +58,13 @@ class InboxOnServer {
         try {
             (0, file_1.ensureCorrectFS)(syncedFS, 'synced', true);
             const msgReceiver = new recipient_1.MailRecipient(r.address, r.getSigner, () => r.asmailResolver(r.address), r.makeNet());
-            const downloader = new msg_downloader_1.MsgDownloader(msgReceiver);
+            const downloader = new msg_downloader_1.MsgDownloader(msgReceiver, () => inbox.inboxEvents.whenConnected());
             const cache = await cached_msgs_1.CachedMessages.makeFor(cachePath, downloader, r.logError);
             const indexSyncedFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, MSG_INDEX_FOLDER);
             const index = await msg_indexing_1.MsgIndex.make(indexSyncedFS);
             await (0, fs_sync_utils_1.uploadFolderChangesIfAny)(syncedFS);
-            return new InboxOnServer(r.correspondents, msgReceiver, r.getStorages, r.cryptor, downloader, cache, index, r.logError);
+            const inbox = new InboxOnServer(r.correspondents, msgReceiver, r.getStorages, r.cryptor, downloader, cache, index, r.logError);
+            return inbox;
         }
         catch (err) {
             throw (0, error_1.errWithCause)(err, 'Failed to initialize Inbox');

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

@@ -3,8 +3,9 @@ import { ObjDownloader } from "../../../lib-client/objs-on-disk/obj-on-disk";
 import { MsgMeta } from "../../../lib-common/service-api/asmail/retrieval";
 export declare class MsgDownloader {
     private readonly msgReceiver;
+    private readonly whenConnected;
     private readonly runner;
-    constructor(msgReceiver: MailRecipient);
+    constructor(msgReceiver: MailRecipient, whenConnected: () => Promise<void>);
     getMsgMeta(msgId: string): Promise<MsgMeta>;
     getObjDownloader(msgId: string): ObjDownloader;
     private getLayoutWithHeaderAndFirstSegs;

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

@@ -21,8 +21,9 @@ 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 MsgDownloader {
-    constructor(msgReceiver) {
+    constructor(msgReceiver, whenConnected) {
         this.msgReceiver = msgReceiver;
+        this.whenConnected = whenConnected;
         this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.freeze(this);
     }
@@ -34,7 +35,8 @@ class MsgDownloader {
             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)
+            schedule: this.runner.schedule.bind(this.runner),
+            whenConnected: this.whenConnected
         };
     }
     async getLayoutWithHeaderAndFirstSegs(msgId, objId) {

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

@@ -3,8 +3,9 @@ import { ObjId } from '../../../lib-client/xsp-fs/common';
 import { ObjDownloader, InitDownloadParts, Section, Download } from '../../../lib-client/objs-on-disk/obj-on-disk';
 export declare class Downloader implements ObjDownloader {
     private readonly remoteStorage;
+    readonly whenConnected: () => Promise<void>;
     private readonly runner;
-    constructor(remoteStorage: StorageOwner);
+    constructor(remoteStorage: StorageOwner, whenConnected: () => Promise<void>);
     getLayoutWithHeaderAndFirstSegs(objId: ObjId, version: number): Promise<InitDownloadParts>;
     schedule(download: Download): void;
     getSegs(objId: ObjId, version: number, start: number, end: number): Promise<Uint8Array>;

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

@@ -21,8 +21,9 @@ 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) {
+    constructor(remoteStorage, whenConnected) {
         this.remoteStorage = remoteStorage;
+        this.whenConnected = whenConnected;
         this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.seal(this);
     }

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

@@ -27,7 +27,7 @@ export declare class ObjFiles {
     private readonly downloader;
     private readonly gc;
     private constructor();
-    static makeFor(path: string, remote: RemoteStorage, logError: LogError): Promise<ObjFiles>;
+    static makeFor(path: string, remote: RemoteStorage, whenConnected: () => Promise<void>, logError: LogError): Promise<ObjFiles>;
     private canMoveObjToDeeperCache;
     findObj(objId: ObjId): Promise<SyncedObj | undefined>;
     getObjInCache(objId: ObjId): SyncedObj | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2016 - 2020, 2022, 2025 - 2026 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
@@ -42,12 +42,12 @@ exports.REMOTE_FILE_NAME_EXT = 'v';
  * SyncedObj's.
  */
 class ObjFiles {
-    constructor(folders, remote, logError) {
+    constructor(folders, remote, whenConnected, logError) {
         this.folders = folders;
         this.logError = logError;
         this.objs = (0, timed_cache_1.makeTimedCache)(60 * 1000);
         this.sync = makeSynchronizer();
-        this.downloader = new downloader_1.Downloader(remote);
+        this.downloader = new downloader_1.Downloader(remote, whenConnected);
         this.gc = new obj_files_gc_1.GC(this.sync, obj => {
             if (this.objs.get(obj.objId) === obj) {
                 this.objs.delete(obj.objId);
@@ -55,10 +55,10 @@ class ObjFiles {
         }, objId => this.folders.removeFolderOf(objId));
         Object.freeze(this);
     }
-    static async makeFor(path, remote, logError) {
+    static async makeFor(path, remote, whenConnected, logError) {
         const canMove = (objId, objFolderPath) => objFiles.canMoveObjToDeeperCache(objId, objFolderPath);
         const folders = await obj_folders_1.ObjFolders.makeWithGenerations(path, canMove, logError);
-        const objFiles = new ObjFiles(folders, remote, logError);
+        const objFiles = new ObjFiles(folders, remote, whenConnected, logError);
         return objFiles;
     }
     async canMoveObjToDeeperCache(objId, objFolderPath) {

package/build/core/storage/synced/remote-events.d.ts

@@ -19,13 +19,12 @@ export declare class RemoteEvents {
     private readonly connectionEvents;
     readonly connectionEvent$: Observable<StorageConnectionStatus>;
     private readonly wsProc;
-    private deferredConnection;
+    private connection;
     constructor(remoteStorage: StorageOwner, files: ObjFiles, broadcastNodeEvent: Storage['broadcastNodeEvent'], logError: LogError);
     private makeProc;
     startListening(): void;
     close(): Promise<void>;
     whenConnected(): Promise<void>;
-    private signalConnected;
     private absorbObjChange;
     private absorbObjRemoval;
     private absorbObjVersionArchival;

package/build/core/storage/synced/remote-events.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2019 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2019 - 2020, 2022, 2025 - 2026 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
@@ -21,7 +21,7 @@ const rxjs_1 = require("rxjs");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 const operators_1 = require("rxjs/operators");
 const ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
-const deferred_1 = require("../../../lib-common/processes/deferred");
+const awaitable_state_1 = require("../../../lib-common/awaitable-state");
 function toStorageConnectionStatus(status, params) {
     return (0, ws_ipc_1.addToStatus)(status, {
         service: 'storage',
@@ -41,23 +41,21 @@ class RemoteEvents {
         this.logError = logError;
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
-        this.deferredConnection = (0, deferred_1.defer)();
+        this.connection = new awaitable_state_1.AwaitableState();
         this.wsProc = new ws_ipc_1.WebSocketListening(SERVER_EVENTS_RESTART_WAIT_SECS, this.makeProc.bind(this));
         Object.seal(this);
     }
     makeProc() {
         return (0, rxjs_1.from)(this.remoteStorage.openEventSource().then(({ client, heartbeat }) => {
-            this.signalConnected();
+            this.connection.setState();
             heartbeat.subscribe({
                 next: ev => {
                     this.connectionEvents.next(toStorageConnectionStatus(ev));
                     if (ev.type === 'heartbeat') {
-                        this.signalConnected();
+                        this.connection.setState();
                     }
                     else if ((ev.type === 'heartbeat-skip') || (ev.type === 'disconnected')) {
-                        if (!this.deferredConnection) {
-                            this.deferredConnection = (0, deferred_1.defer)();
-                        }
+                        this.connection.clearState();
                     }
                 }
             });
@@ -79,14 +77,7 @@ class RemoteEvents {
         this.wsProc.close();
     }
     async whenConnected() {
-        var _a;
-        return (_a = this.deferredConnection) === null || _a === void 0 ? void 0 : _a.promise;
-    }
-    signalConnected() {
-        if (this.deferredConnection) {
-            this.deferredConnection.resolve();
-            this.deferredConnection = undefined;
-        }
+        return this.connection.whenStateIsSet();
     }
     absorbObjChange(client) {
         return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objChanged.EVENT_NAME, obs)))

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

@@ -40,12 +40,12 @@ class SyncedStore {
         this.nodes = new common_1.NodesContainer();
         this.events = new utils_for_observables_1.Broadcast();
         this.remoteEvents = new remote_events_1.RemoteEvents(this.remoteStorage, this.files, this.broadcastNodeEvent.bind(this), this.logError);
-        this.uploader = new upsyncer_1.UpSyncer(this.remoteStorage, this.logError);
+        this.uploader = new upsyncer_1.UpSyncer(this.remoteStorage, this.whenConnected.bind(this), this.logError);
         Object.seal(this);
     }
     static async makeAndStart(path, user, getSigner, getStorages, cryptor, remoteServiceUrl, net, logError) {
         const remote = storage_owner_1.StorageOwner.make(user, getSigner, remoteServiceUrl, net);
-        const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
+        const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, () => s.whenConnected(), logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
         s.uploader.start();
         return {
@@ -57,7 +57,7 @@ class SyncedStore {
     }
     static async makeAndStartWithoutRemote(path, user, getStorages, cryptor, remoteServiceUrl, net, logError) {
         const { remote, setMid } = storage_owner_1.StorageOwner.makeBeforeMidSetup(user, remoteServiceUrl, net);
-        const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
+        const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, () => s.whenConnected(), logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
         return {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),

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

@@ -8,19 +8,15 @@ import { UploadEventSink, UploadHeaderChange } from "../../../lib-client/xsp-fs/
 export type FileWriteTapOperator = MonoTypeOperatorFunction<FileWrite[]>;
 export declare class UpSyncer {
     private readonly remoteStorage;
+    private readonly whenConnected;
     private readonly logError;
     private readonly execPools;
     private readonly tasksByObjIds;
     private readonly tasksByIds;
     private readonly syncedUploadStarts;
-    constructor(remoteStorage: StorageOwner, logError: LogError);
+    constructor(remoteStorage: StorageOwner, whenConnected: () => Promise<void>, logError: LogError);
     start(): void;
     stop(): Promise<void>;
-    /**
-     * Creates an rxjs operator to tap saving process, starting upload while
-     * writing is ongoing.
-     */
-    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: UploadEventSink | undefined): Promise<{
         completion: Promise<void>;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2020, 2022, 2025 - 2026 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
@@ -27,8 +27,9 @@ const synced_1 = require("../../../lib-common/processes/synced");
 const MAX_CHUNK_SIZE = 512 * 1024;
 const MAX_FAST_UPLOAD = 2 * 1024 * 1024;
 class UpSyncer {
-    constructor(remoteStorage, logError) {
+    constructor(remoteStorage, whenConnected, logError) {
         this.remoteStorage = remoteStorage;
+        this.whenConnected = whenConnected;
         this.logError = logError;
         this.tasksByObjIds = new Map();
         this.tasksByIds = new Map();
@@ -45,25 +46,19 @@ class UpSyncer {
     async stop() {
         await this.execPools.stop(); // implicitly cancels all upsync tasks
     }
-    /**
-     * Creates an rxjs operator to tap saving process, starting upload while
-     * writing is ongoing.
-     */
-    tapFileWrite(obj, isNew, newVersion, baseVersion) {
-        throw new Error('UpSyncer.tapFileWrite() not implemented');
-        // const objUploads = this.getOrMakeUploadsFor(obj);
-        // return objUploads.tapFileWrite(isNew, newVersion, baseVersion);
-    }
     async removeCurrentVersionOf(obj) {
         try {
             await this.remoteStorage.deleteObj(obj.objId);
         }
         catch (exc) {
-            // XXX
-            //  - we need to distinguish errors and put this work somewhere
-            //    to run when we go online, for example.
-            await this.logError(exc, `Uploading of obj removal failed.`);
-            return;
+            if (exc.type === 'connect') {
+                await this.whenConnected();
+                return this.removeCurrentVersionOf(obj);
+            }
+            else {
+                await this.logError(exc, `Uploading of obj removal failed.`);
+                return;
+            }
         }
         await obj.recordRemovalUploadAndGC();
     }
@@ -88,7 +83,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, async () => {
+            const task = await UploadTask.for(obj, localVersion, uploadVersion, uploadHeader === null || uploadHeader === void 0 ? void 0 : uploadHeader.uploadHeader, syncedBase, createOnRemote, uploadTaskId, eventSink, this.remoteStorage, this.whenConnected, async () => {
                 if (this.tasksByIds.delete(task.taskId)) {
                     this.tasksByObjIds.delete(task.objId);
                 }
@@ -113,9 +108,10 @@ exports.UpSyncer = UpSyncer;
 Object.freeze(UpSyncer.prototype);
 Object.freeze(UpSyncer);
 class UploadTask {
-    constructor(taskId, remoteStorage, objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink) {
+    constructor(taskId, remoteStorage, whenConnected, objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink) {
         this.taskId = taskId;
         this.remoteStorage = remoteStorage;
+        this.whenConnected = whenConnected;
         this.objId = objId;
         this.objStatus = objStatus;
         this.src = src;
@@ -129,7 +125,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, doAtCompletion) {
+    static async for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createObj, taskId, eventSink, remoteStorage, whenConnected, doAtCompletion) {
         const src = await obj.getObjSrcFromLocalAndSyncedBranch(localVersion);
         let needUpload;
         if (syncedBase) {
@@ -148,7 +144,7 @@ class UploadTask {
         };
         const objStatus = obj.statusObj();
         await objStatus.recordUploadStart(info);
-        return new UploadTask(taskId, remoteStorage, obj.objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink);
+        return new UploadTask(taskId, remoteStorage, whenConnected, obj.objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink);
     }
     neededExecutor() {
         return (!this.info.needUpload ? undefined : this.execLabel);
@@ -213,14 +209,21 @@ class UploadTask {
             }
         }
         catch (exc) {
-            this.info.needUpload = undefined;
-            this.uploadCompletion.reject((0, exceptions_1.makeFSSyncException)(`obj-upload`, {
-                message: `Fail to upload local version ${this.info.uploadVersion}`,
-                localVersion: this.info.uploadVersion,
-                cause: exc
-            }));
-            await this.objStatus.recordUploadCancellation(this.info);
-            return true;
+            if (exc.type === 'connect') {
+                this.emitUploadEvent('upload-disconnected', {});
+                await this.whenConnected();
+                return false;
+            }
+            else {
+                this.info.needUpload = undefined;
+                this.uploadCompletion.reject((0, exceptions_1.makeFSSyncException)(`obj-upload`, {
+                    message: `Fail to upload local version ${this.info.uploadVersion}`,
+                    localVersion: this.info.uploadVersion,
+                    cause: exc
+                }));
+                await this.objStatus.recordUploadCancellation(this.info);
+                return true;
+            }
         }
     }
     async startOrderedUpload(upload) {