core-3nweb-client-lib 0.49.2 → 0.49.4

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

@@ -154,8 +154,11 @@ class Delivery {
         }
         const attachments = common_1.Attachments.fromMsg(msgToSend);
         const localMeta = opts === null || opts === void 0 ? void 0 : opts.localMeta;
-        // DEBUG console to help capturing a bug
-        console.log(`Sending msg with delivery id ${id} ${attachments ? `with attachments` : `without attachments`}`);
+        // DEBUG log
+        console.log(`\n adding message ${msgToSend.attachments ? `with attachments: ${{
+            files: msgToSend.attachments.files ? Object.keys(msgToSend.attachments.files).length : 0,
+            folders: msgToSend.attachments.folders ? Object.keys(msgToSend.attachments.folders).length : 0
+        }}` : `without attachments in outgoing msg object.`}`);
         // save msg, in case delivery should be restarted
         const msgFS = await this.makeFSForNewMsg(id);
         const msg = await msg_1.Msg.forNew(id, msgFS, msgToSend, sender, recipients, this.r, attachments, localMeta, opts === null || opts === void 0 ? void 0 : opts.retryRecipient);

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

@@ -128,7 +128,11 @@ class Msg {
         await this.msgFS.writeJSONFile(MAIN_OBJ_FILE_NAME, main, { create: true, exclusive: true });
         await this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, { create: true, exclusive: true });
         if (this.attachments) {
-            await this.attachments.linkIn(this.msgFS);
+            console.log(`Linking attachments ...`);
+            await this.attachments.linkIn(this.msgFS)
+                .then(
+            // DEBUG log
+            () => console.log(` .... msg attachments linked while delivery`), err => console.error(`linking attachments error:`, err));
         }
     }
     notifyOfChangesInProgress(saveProgress, saveWIPs) {
@@ -189,6 +193,8 @@ class Msg {
         msg.setSection('Cc', this.msgToSend.carbonCopy);
         msg.setSection('To', this.msgToSend.recipients);
         if (this.attachments) {
+            // DEBUG log
+            console.log(`setting attachment on messages packer`);
             await msg.setAttachments(this.attachments);
         }
         return msg;

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);
     }
     /**
@@ -81,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;
@@ -102,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 {
@@ -160,6 +164,8 @@ class WIP {
     async getRecipientKeyAndEncrypt() {
         const recipient = this.sender.recipient;
         const introPKeyFromServer = await this.getIntroKeyIfRecipientIsUnknown(recipient);
+        // DEBUG log
+        console.log(`\n wip.getRecipientKeyAndEncrypt()`);
         this.packer = await this.msg.msgPacker();
         // get crypto parts for encrypting this message
         const { currentPair, encryptor, msgCount } = await this.msg.r.correspondents.generateKeysToSend(recipient, introPKeyFromServer);
@@ -187,7 +193,7 @@ class WIP {
             this.packer.setNextSendingParams(nextSendingParams);
         }
         // pack the message
-        this.state.pack = await this.packer.pack();
+        this.state.pack = this.packer.pack();
         // initialize uploads info
         this.state.objUploads = new Array(this.state.pack.meta.objIds.length);
         this.state.objUploads.fill(null);
@@ -256,8 +262,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";
         }
@@ -310,6 +317,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;
@@ -329,12 +339,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();
             }
@@ -362,6 +377,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();
@@ -393,6 +410,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;
     }
     /**
@@ -402,12 +421,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
@@ -427,6 +450,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/core/asmail/msg/packer.d.ts

@@ -129,6 +129,6 @@ export declare class MsgPacker {
     getNewSrcForObj(objId: string, cryptor: AsyncSBoxCryptor): Promise<ObjSource>;
     getRestartedSrcForObj(objId: string, header: Uint8Array, offset: number, cryptor: AsyncSBoxCryptor): Promise<ObjSource>;
     private getSrcForNonMainObj;
-    pack(): Promise<PackJSON>;
+    pack(): PackJSON;
 }
 export {};

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

@@ -238,9 +238,7 @@ class MsgPacker {
         if (this.meta) {
             throw new Error("Message metadata has already been set.");
         }
-        this.meta = {
-            pid: pid,
-        };
+        this.meta = { pid };
         this.main['Flow Params'].msgCount = msgCount;
         Object.freeze(this.meta);
     }
@@ -333,6 +331,8 @@ class MsgPacker {
         if (this.hasAttachments) {
             this.main['Attachments'] = attachments;
         }
+        // DEBUG log
+        console.log(` message packer allObjs has ${this.allObjs.size} items`);
     }
     throwupOnMissingParts() {
         if (!this.meta) {
@@ -341,8 +341,7 @@ class MsgPacker {
         if (!this.wasBodySet) {
             throw new Error("Message Body is not set.");
         }
-        if (this.meta.senderPKey &&
-            !this.main['Flow Params'].introCerts) {
+        if (this.meta.senderPKey && !this.main['Flow Params'].introCerts) {
             throw new Error("Sender's key certification is missing.");
         }
     }
@@ -365,16 +364,14 @@ class MsgPacker {
             if (this.attachmentsCont) {
                 const fName = path.path[0];
                 if (path.path.length === 1) {
-                    const file = (this.attachmentsCont.files ?
-                        this.attachmentsCont.files[fName] : undefined);
+                    const file = (this.attachmentsCont.files ? this.attachmentsCont.files[fName] : undefined);
                     if (!file) {
                         throw new Error(`File ${fName} is not found in attachments.`);
                     }
                     return file.getByteSource();
                 }
                 else {
-                    const fs = (this.attachmentsCont.folders ?
-                        this.attachmentsCont.folders[fName] : undefined);
+                    const fs = (this.attachmentsCont.folders ? this.attachmentsCont.folders[fName] : undefined);
                     if (!fs) {
                         throw new Error(`Folder ${fName} is not found in attachments.`);
                     }
@@ -440,7 +437,7 @@ class MsgPacker {
         }
         return src;
     }
-    async pack() {
+    pack() {
         if (this.readyPack) {
             return this.readyPack;
         }

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

@@ -451,10 +451,6 @@ class MailSender {
             }
         }
         else if (rep.status === api.msgObj.SC.ok) {
-            // DEBUG console to help capturing a bug
-            if ((fstReq === null || fstReq === void 0 ? void 0 : fstReq.last) || (followReq === null || followReq === void 0 ? void 0 : followReq.last)) {
-                console.log(`sent obj ${objId} within msg ${this.msgId}`);
-            }
             // normal return
             return;
         }

package/package.json

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