core-3nweb-client-lib 0.49.1 → 0.49.3

package/build/core/asmail/delivery/per-recipient-wip.js

@@ -39,8 +39,7 @@ class WIP {
         this.packer = undefined;
         this.currentObjIndInMeta = 0;
         this.currentObj = undefined;
-        this.doStateRecording =
-            (this.msg.progress.msgSize > MSG_SIZE_FOR_STATE_RECORDING);
+        this.doStateRecording = (this.msg.progress.msgSize > MSG_SIZE_FOR_STATE_RECORDING);
         Object.seal(this);
     }
     /**
@@ -65,8 +64,7 @@ class WIP {
             const wip = new WIP(msg, state, cryptor);
             wip.packer = await msg.msgPacker(state.pack);
             if (state.bytesUploaded > 0) {
-                msg.progress.recipients[state.recipient].bytesSent =
-                    state.bytesUploaded;
+                msg.progress.recipients[state.recipient].bytesSent = state.bytesUploaded;
             }
             return wip;
         }
@@ -82,6 +80,7 @@ class WIP {
      * or if this wip is done, undefined is returned.
      */
     startNext() {
+        var _a, _b;
         let proc = this.proc.latestTaskAtThisMoment();
         if (proc) {
             return;
@@ -103,9 +102,13 @@ class WIP {
             proc = this.proc.addStarted(this.sendObjs());
         }
         else if (stage === "cancel") {
+            // DEBUG log
+            console.log(` canceled sending msgId: ${(_a = this.state.session) === null || _a === void 0 ? void 0 : _a.msgId}`);
             return;
         }
         else if (stage === undefined) {
+            // DEBUG log
+            console.log(` done sending msgId: ${(_b = this.state.session) === null || _b === void 0 ? void 0 : _b.msgId}`);
             return;
         }
         else {
@@ -230,8 +233,7 @@ class WIP {
         const recInfo = this.msg.progress.recipients[recipient];
         if (complete) {
             if (err) {
-                recInfo.err = (err.runtimeException ?
-                    err : (err.stack ? err.stack : err));
+                recInfo.err = (err.runtimeException ? err : (err.stack ? err.stack : err));
             }
             else {
                 recInfo.bytesSent = this.msg.progress.msgSize;
@@ -258,8 +260,9 @@ class WIP {
             throw new Error(`Message pack is not set.`);
         }
         this.state.session = await this.sender.sendMetadata(this.state.pack.meta);
-        this.msg.progress.recipients[this.state.recipient].idOnDelivery =
-            this.state.session.msgId;
+        // DEBUG log
+        console.log(`\n wip.sendMeta() returned with\n   msgId: ${this.state.session.msgId}\n   meta.objIds sent to server:`, this.state.pack.meta.objIds);
+        this.msg.progress.recipients[this.state.recipient].idOnDelivery = this.state.session.msgId;
         if (this.state.stage !== "cancel") {
             this.state.stage = "5-send-objs";
         }
@@ -312,6 +315,9 @@ class WIP {
         return { objId, upload, src };
     }
     async completeDelivery() {
+        var _a;
+        // DEBUG log
+        console.log(` wip.completeDelivery() msg ${!!((_a = this.state.session) === null || _a === void 0 ? void 0 : _a.msgId)}`);
         await this.sender.completeDelivery();
         this.updateInfo(0, true);
         this.state.stage = undefined;
@@ -331,12 +337,17 @@ class WIP {
      * completes sending, when no more sending is left.
      */
     async sendObjs() {
+        var _a, _b, _c;
+        // DEBUG log
+        console.log(` wip.sendObjs(), msgId: ${(_a = this.state.session) === null || _a === void 0 ? void 0 : _a.msgId}, p 0, \n   !!this.sender is ${!!this.sender}\n   this.currentObj is ${(_b = this.currentObj) === null || _b === void 0 ? void 0 : _b.objId}`);
         if (!this.sender) {
             this.sender = await sender_1.MailSender.resume(this.msg.r.makeNet(), this.state.recipient, this.state.session);
         }
         // ensure there is an object to send, or complete delivery
         if (!this.currentObj) {
             this.currentObj = await this.getObjToSend();
+            // DEBUG log
+            console.log(`   ... this.getObjToSend() sets currentObj to be ${(_c = this.currentObj) === null || _c === void 0 ? void 0 : _c.objId}`);
             if (!this.currentObj) {
                 return this.completeDelivery();
             }
@@ -364,6 +375,8 @@ class WIP {
      * @param obj is a message object to send
      */
     async firstObjSendingRequest(obj) {
+        // DEBUG log
+        console.log(` wip.firstObjSendingRequest() ${obj.objId}`);
         // read from source
         const header = await obj.src.readHeader();
         const { size, isEndless } = await obj.src.segSrc.getSize();
@@ -395,6 +408,8 @@ class WIP {
             obj.upload.header = buffer_utils_1.base64.pack(header);
         }
         this.updateInfo(header.length + segsChunk.length);
+        // DEBUG log
+        console.log(`  ... ${obj.objId} 1st/single obj request send, isObjDone is ${isObjDone}`);
         return isObjDone;
     }
     /**
@@ -404,12 +419,16 @@ class WIP {
      * @param obj is a message object to send
      */
     async followingObjSendingRequest(obj) {
+        // DEBUG log
+        console.log(` wip.followingObjSendingRequest() ${obj.objId}`);
         // read from source
         const segsSize = obj.upload.expectedSegsSize;
         const chunk = await obj.src.segSrc.readNext(this.sender.maxChunkSize);
         // return early, when there are no bytes
         if (!chunk) {
             await this.sender.sendObj(obj.objId, EMPTY_BYTE_ARR, undefined, { ofs: obj.upload.segsOffset, last: true });
+            // DEBUG log
+            console.log(`  ... ${obj.objId} 2nd/following obj request has no more chunk to send, and completed sending obj`);
             return true;
         }
         // check for an overrun
@@ -429,6 +448,8 @@ class WIP {
         await this.sender.sendObj(obj.objId, chunk, undefined, opts);
         obj.upload.segsOffset += chunk.length;
         this.updateInfo(chunk.length);
+        // DEBUG log
+        console.log(`  ... ${obj.objId} 2nd/following obj request sent ${chunk.length} bytes, isObjDone is ${isObjDone}`);
         return isObjDone;
     }
 }

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

@@ -155,9 +155,9 @@ class MailSender {
         }
     }
     prepareRedirectOrThrowUp(rep) {
-        if (("string" !== typeof rep.redirect) ||
-            (rep.redirect.length === 0) ||
-            ((new URL(rep.redirect)).protocol !== 'https:')) {
+        if (("string" !== typeof rep.redirect)
+            || (rep.redirect.length === 0)
+            || ((new URL(rep.redirect)).protocol !== 'https:')) {
             throw this.badRedirectExc();
         }
         // refuse second redirect
@@ -413,8 +413,8 @@ class MailSender {
     async trySessionRestart() {
         // check and set timestamp for session restarts
         const now = Date.now();
-        if ((typeof this.sessionRestartTimeStamp === 'number') &&
-            (now <= (this.sessionRestartTimeStamp + TOO_EARLY_RESTART_PERIOD))) {
+        if ((typeof this.sessionRestartTimeStamp === 'number')
+            && (now <= (this.sessionRestartTimeStamp + TOO_EARLY_RESTART_PERIOD))) {
             return false;
         }
         this.sessionRestartTimeStamp = now;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.49.1",
+  "version": "0.49.3",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",