core-3nweb-client-lib 0.42.14 → 0.42.16

package/build/core/asmail/delivery/msg.d.ts

@@ -11,9 +11,9 @@ export declare class Msg {
     readonly r: ResourcesForSending;
     readonly progress: DeliveryProgress;
     private readonly msgFS;
+    private static readonly progressSavingProcs;
     private readonly sendingProc;
     private completionPromise;
-    private readonly progressSavingProc;
     private cancelled;
     private sender;
     private recipients;

package/build/core/asmail/delivery/msg.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2018, 2020, 2023 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 2020, 2023, 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
@@ -65,7 +65,7 @@ class Msg {
         this.msgFS = msgFS;
         this.sendingProc = new synced_1.SingleProc();
         this.completionPromise = undefined;
-        this.progressSavingProc = new synced_1.SingleProc();
+        // private readonly progressSavingProc = new SingleProc();
         this.cancelled = false;
         this.sender = undefined;
         this.recipients = undefined;
@@ -101,7 +101,9 @@ class Msg {
         return msg;
     }
     static async forRestart(id, msgFS, r) {
-        const progress = await msgFS.readJSONFile(PROGRESS_INFO_FILE_NAME);
+        const progress = await Msg.progressSavingProcs.startOrChain(id, async () => {
+            return await msgFS.readJSONFile(PROGRESS_INFO_FILE_NAME);
+        });
         if (progress.allDone) {
             return new Msg(id, undefined, progress, undefined);
         }
@@ -148,11 +150,13 @@ class Msg {
         this.r.notifyMsgProgress(this.id, (0, json_utils_1.copy)(this.progress));
         this.progressPublisher.next((0, json_utils_1.copy)(this.progress));
         if (saveProgress) {
-            this.progressSavingProc.startOrChain(() => this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, {}));
+            Msg.progressSavingProcs.startOrChain(this.id, async () => {
+                await this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, {});
+            });
         }
         if (this.isDone()) {
             this.progressPublisher.complete();
-            this.progressSavingProc.startOrChain(async () => {
+            Msg.progressSavingProcs.startOrChain(this.id, async () => {
                 await this.msgFS.deleteFile(WIPS_INFO_FILE_NAME).catch(noop);
                 if (this.attachments) {
                     await this.attachments.deleteFrom(this.msgFS);
@@ -160,7 +164,7 @@ class Msg {
             });
         }
         else if (saveWIPs) {
-            this.progressSavingProc.startOrChain(async () => {
+            Msg.progressSavingProcs.startOrChain(this.id, async () => {
                 await this.msgFS.writeJSONFile(WIPS_INFO_FILE_NAME, this.wipsInfo);
             });
         }
@@ -227,7 +231,7 @@ class Msg {
             return;
         }
         this.cancelled = true;
-        const filesProc = this.progressSavingProc.latestTaskAtThisMoment();
+        const filesProc = Msg.progressSavingProcs.latestTaskAtThisMoment(this.id);
         if (!filesProc) {
             return;
         }
@@ -341,6 +345,7 @@ class Msg {
     }
 }
 exports.Msg = Msg;
+Msg.progressSavingProcs = new synced_1.NamedProcs();
 Object.freeze(Msg.prototype);
 Object.freeze(Msg);
 function noop() { }

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

@@ -89,9 +89,9 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             responseType: 'json'
         });
         if (rep.status === api.msgMetadata.SC.ok) {
-            const meta = api.sanitizedMeta(rep.data);
+            const { meta, errMsg } = api.sanitizedMeta(rep.data);
             if (!meta) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed response');
+                throw (0, request_utils_1.makeException)(rep, `Malformed message metadata in a server response: ${errMsg}`);
             }
             return meta;
         }