core-3nweb-client-lib 0.44.6 → 0.44.8

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

@@ -1211,6 +1211,7 @@ declare namespace web3n.files {
 
 	interface UploadStartEvent extends UploadEventBase {
 		type: 'upload-started';
+		isRestart: boolean;
 		totalBytesToUpload: number;
 	}
 

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 - 2018, 2020, 2025 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 2020, 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
@@ -31,6 +31,7 @@ declare namespace web3n {
 		type?: string;
 		cause?: any;
 		message?: string;
+		stack?: string;
 	}
 
 	interface ConnectException extends RuntimeException {

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

@@ -31,7 +31,6 @@ 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>;

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

@@ -22,7 +22,6 @@ 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',
@@ -53,7 +52,6 @@ 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);
@@ -65,10 +63,10 @@ class InboxEvents {
                 next: ev => {
                     this.connectionEvents.next(toInboxConnectionStatus(ev));
                     if (ev.type === 'heartbeat') {
-                        this.connection.setState();
+                        this.msgReceiver.connectedState.setState();
                     }
                     else if ((ev.type === 'heartbeat-skip') || (ev.type === 'disconnected')) {
-                        this.connection.clearState();
+                        this.msgReceiver.connectedState.clearState();
                     }
                 }
             });
@@ -87,7 +85,7 @@ class InboxEvents {
         return proc$;
     }
     async whenConnected() {
-        return this.connection.whenStateIsSet();
+        return this.msgReceiver.connectedState.whenStateIsSet();
     }
     async getMessage(msgId) {
         try {

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

@@ -58,7 +58,7 @@ 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, () => inbox.inboxEvents.whenConnected());
+            const downloader = new msg_downloader_1.MsgDownloader(msgReceiver);
             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);

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

@@ -3,9 +3,8 @@ 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, whenConnected: () => Promise<void>);
+    constructor(msgReceiver: MailRecipient);
     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, 2025 3NSoft Inc.
+ Copyright (C) 2016 - 2019, 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,9 +21,8 @@ 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, whenConnected) {
+    constructor(msgReceiver) {
         this.msgReceiver = msgReceiver;
-        this.whenConnected = whenConnected;
         this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.freeze(this);
     }
@@ -36,7 +35,7 @@ class MsgDownloader {
             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),
-            whenConnected: this.whenConnected
+            whenConnected: () => this.msgReceiver.connectedState.whenStateIsSet()
         };
     }
     async getLayoutWithHeaderAndFirstSegs(msgId, objId) {

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

@@ -409,7 +409,7 @@ class SyncedObj {
     }
     async getNumOfBytesNeedingDownload(version) {
         if (!this.status.isAmongRemote(version)) {
-            if (this.localVers.has(version)) {
+            if (this.status.isLocalOnlyVersion(version)) {
                 return 0;
             }
             else {

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

@@ -111,6 +111,7 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     getNonGarbageVersions(): NonGarbage;
     removeCurrentVersion(): Promise<void>;
     private triggerSaveProc;
+    get upload(): UploadInfo | undefined;
     recordUploadStart(info: NewVersionUpload): Promise<void>;
     recordUploadInterimState(info: NewVersionUpload): Promise<void>;
     recordUploadCancellation(info: NewVersionUpload): Promise<void>;
@@ -147,6 +148,7 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     versionBeforeUnsyncedRemoval(): number | undefined;
     adoptRemoteVersion(version?: number): Promise<void>;
     isAmongRemote(version: number): boolean;
+    isLocalOnlyVersion(version: number): boolean;
 }
 export declare function readAndCheckStatus(objFolder: string, objId: ObjId): Promise<ObjStatusInfo>;
 export declare function countBytesIn(info: UploadInfo): number;

package/build/core/storage/synced/obj-status.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
@@ -197,10 +197,7 @@ class ObjStatus {
                 return;
             }
             else {
-                throw (0, runtime_1.makeRuntimeException)('file', {
-                    path: (0, path_1.join)(this.objFolder, exports.STATUS_FILE_NAME),
-                    fsEtityType: 'file', message: `Upload is in progress`
-                }, { concurrentUpdate: true });
+                throw (0, runtime_1.makeRuntimeException)('file', { path: (0, path_1.join)(this.objFolder, exports.STATUS_FILE_NAME), fsEtityType: 'file', message: `Upload is in progress` }, { concurrentUpdate: true }, true);
             }
         }
         if (!remote.isArchived && remote.current) {
@@ -237,6 +234,9 @@ class ObjStatus {
             }
         }
     }
+    get upload() {
+        return this.status.upload;
+    }
     recordUploadStart(info) {
         var _a;
         if (this.status.upload) {
@@ -567,6 +567,10 @@ class ObjStatus {
         }
         return false;
     }
+    isLocalOnlyVersion(version) {
+        var _a;
+        return (((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.current) === version);
+    }
 }
 exports.ObjStatus = ObjStatus;
 Object.freeze(ObjStatus.prototype);

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

@@ -19,7 +19,6 @@ export declare class RemoteEvents {
     private readonly connectionEvents;
     readonly connectionEvent$: Observable<StorageConnectionStatus>;
     private readonly wsProc;
-    private connection;
     constructor(remoteStorage: StorageOwner, files: ObjFiles, broadcastNodeEvent: Storage['broadcastNodeEvent'], logError: LogError);
     private makeProc;
     startListening(): void;

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

@@ -21,7 +21,6 @@ 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 awaitable_state_1 = require("../../../lib-common/awaitable-state");
 function toStorageConnectionStatus(status, params) {
     return (0, ws_ipc_1.addToStatus)(status, {
         service: 'storage',
@@ -41,21 +40,20 @@ class RemoteEvents {
         this.logError = logError;
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
-        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.connection.setState();
+            this.remoteStorage.connectedState.setState();
             heartbeat.subscribe({
                 next: ev => {
                     this.connectionEvents.next(toStorageConnectionStatus(ev));
                     if (ev.type === 'heartbeat') {
-                        this.connection.setState();
+                        this.remoteStorage.connectedState.setState();
                     }
                     else if ((ev.type === 'heartbeat-skip') || (ev.type === 'disconnected')) {
-                        this.connection.clearState();
+                        this.remoteStorage.connectedState.clearState();
                     }
                 }
             });
@@ -76,8 +74,8 @@ class RemoteEvents {
         this.connectionEvents.complete();
         this.wsProc.close();
     }
-    async whenConnected() {
-        return this.connection.whenStateIsSet();
+    whenConnected() {
+        return this.remoteStorage.connectedState.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,7 +40,7 @@ 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.whenConnected.bind(this), this.logError);
+        this.uploader = new upsyncer_1.UpSyncer(this.remoteStorage, this.logError);
         Object.seal(this);
     }
     static async makeAndStart(path, user, getSigner, getStorages, cryptor, remoteServiceUrl, net, logError) {
@@ -249,7 +249,7 @@ class SyncedStore {
         return this.remoteEvents.connectionEvent$;
     }
     whenConnected() {
-        return this.remoteEvents.whenConnected();
+        return this.remoteStorage.connectedState.whenStateIsSet();
     }
 }
 exports.SyncedStore = SyncedStore;

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

@@ -8,13 +8,12 @@ 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, whenConnected: () => Promise<void>, logError: LogError);
+    constructor(remoteStorage: StorageOwner, logError: LogError);
     start(): void;
     stop(): Promise<void>;
     removeCurrentVersionOf(obj: SyncedObj): Promise<void>;

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

@@ -27,9 +27,8 @@ 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, whenConnected, logError) {
+    constructor(remoteStorage, logError) {
         this.remoteStorage = remoteStorage;
-        this.whenConnected = whenConnected;
         this.logError = logError;
         this.tasksByObjIds = new Map();
         this.tasksByIds = new Map();
@@ -52,7 +51,7 @@ class UpSyncer {
         }
         catch (exc) {
             if (exc.type === 'connect') {
-                await this.whenConnected();
+                await this.remoteStorage.connectedState.whenStateIsSet();
                 return this.removeCurrentVersionOf(obj);
             }
             else {
@@ -83,7 +82,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.whenConnected, 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);
                 }
@@ -108,10 +107,9 @@ exports.UpSyncer = UpSyncer;
 Object.freeze(UpSyncer.prototype);
 Object.freeze(UpSyncer);
 class UploadTask {
-    constructor(taskId, remoteStorage, whenConnected, objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink) {
+    constructor(taskId, remoteStorage, objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink, isRestart) {
         this.taskId = taskId;
         this.remoteStorage = remoteStorage;
-        this.whenConnected = whenConnected;
         this.objId = objId;
         this.objStatus = objStatus;
         this.src = src;
@@ -122,29 +120,51 @@ class UploadTask {
         this.uploadCompletion = (0, deferred_1.defer)();
         this.execLabel = executorLabelFor(this.info.needUpload);
         this.totalBytesToUpload = (0, obj_status_1.countBytesIn)(this.info);
-        this.emitUploadEvent('upload-started', { totalBytesToUpload: this.totalBytesToUpload });
+        this.emitUploadEvent('upload-started', { totalBytesToUpload: this.totalBytesToUpload, isRestart });
         Object.seal(this);
     }
-    static async for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createObj, taskId, eventSink, remoteStorage, whenConnected, doAtCompletion) {
+    static async for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createObj, taskId, eventSink, remoteStorage, doAtCompletion) {
         const src = await obj.getObjSrcFromLocalAndSyncedBranch(localVersion);
-        let needUpload;
-        if (syncedBase) {
-            const { diff, newSegsPackOrder } = await obj.diffForUploadOf(localVersion);
-            needUpload = await diffVerUpload(src, uploadHeader, diff, newSegsPackOrder);
+        const objStatus = obj.statusObj();
+        if (objStatus.upload) {
+            const info = objStatus.upload;
+            if ((info.type === 'new-version')
+                && (info.localVersion === localVersion) && (info.uploadVersion === uploadVersion)) {
+                return new UploadTask(taskId, remoteStorage, obj.objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink, true);
+            }
+            else {
+                let message;
+                if (info.type === 'new-version') {
+                    message = `Upload type ${info.type} of local version ${info.localVersion} as new remote ${info.uploadVersion} is already scheduled, and is different from uploading local version ${localVersion} as remote ${uploadVersion}.`;
+                }
+                else {
+                    message = `Upload type ${info.type} is already scheduled`;
+                }
+                throw (0, exceptions_1.makeFSSyncException)('sync-task', {
+                    alreadyUploading: true,
+                    message
+                });
+            }
         }
         else {
-            needUpload = await wholeVerUpload(src, uploadHeader, createObj);
+            let needUpload;
+            if (syncedBase) {
+                const { diff, newSegsPackOrder } = await obj.diffForUploadOf(localVersion);
+                needUpload = await diffVerUpload(src, uploadHeader, diff, newSegsPackOrder);
+            }
+            else {
+                needUpload = await wholeVerUpload(src, uploadHeader, createObj);
+            }
+            const info = {
+                type: 'new-version',
+                localVersion,
+                uploadVersion,
+                baseVersion: syncedBase,
+                needUpload
+            };
+            await objStatus.recordUploadStart(info);
+            return new UploadTask(taskId, remoteStorage, obj.objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink, false);
         }
-        const info = {
-            type: 'new-version',
-            localVersion,
-            uploadVersion,
-            baseVersion: syncedBase,
-            needUpload
-        };
-        const objStatus = obj.statusObj();
-        await objStatus.recordUploadStart(info);
-        return new UploadTask(taskId, remoteStorage, whenConnected, obj.objId, objStatus, src, info, uploadHeader, doAtCompletion, eventSink);
     }
     neededExecutor() {
         return (!this.info.needUpload ? undefined : this.execLabel);
@@ -211,13 +231,17 @@ class UploadTask {
         catch (exc) {
             if (exc.type === 'connect') {
                 this.emitUploadEvent('upload-disconnected', {});
-                await this.whenConnected();
+                await this.remoteStorage.connectedState.whenStateIsSet();
                 return false;
             }
             else {
+                if (exc.unexpectedStatus && this.info.needUpload.transactionId) {
+                    await this.remoteStorage.cancelTransaction(this.objId, this.info.needUpload.transactionId)
+                        .catch(noop);
+                }
                 this.info.needUpload = undefined;
                 this.uploadCompletion.reject((0, exceptions_1.makeFSSyncException)(`obj-upload`, {
-                    message: `Fail to upload local version ${this.info.uploadVersion}`,
+                    message: `Fail to upload version ${this.info.uploadVersion} of local version ${this.info.localVersion}`,
                     localVersion: this.info.uploadVersion,
                     cause: exc
                 }));

package/build/lib-client/3nstorage/storage-owner.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 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

package/build/lib-client/asmail/recipient.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015, 2017, 2025 3NSoft Inc.
+ Copyright (C) 2015, 2017, 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
@@ -26,12 +26,14 @@ const user_with_mid_session_1 = require("../user-with-mid-session");
 const service_locator_1 = require("../service-locator");
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
 const http_1 = require("../../lib-common/exceptions/http");
+const runtime_1 = require("../../lib-common/exceptions/runtime");
 function makeMsgNotFoundException(msgId) {
     const exc = {
         runtimeException: true,
         type: 'inbox',
         msgId,
-        msgNotFound: true
+        msgNotFound: true,
+        stack: (0, runtime_1.getStackHere)(1)
     };
     return exc;
 }
@@ -41,7 +43,8 @@ function makeObjNotFoundException(msgId, objId) {
         type: 'inbox',
         msgId,
         objNotFound: true,
-        objId
+        objId,
+        stack: (0, runtime_1.getStackHere)(1)
     };
     return exc;
 }
@@ -50,7 +53,8 @@ function makeMsgIsBrokenException(msgId) {
         runtimeException: true,
         type: 'inbox',
         msgId,
-        msgIsBroken: true
+        msgIsBroken: true,
+        stack: (0, runtime_1.getStackHere)(1)
     };
     return exc;
 }