core-3nweb-client-lib 0.49.4 → 0.49.6

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

@@ -154,11 +154,6 @@ class Delivery {
         }
         const attachments = common_1.Attachments.fromMsg(msgToSend);
         const localMeta = opts === null || opts === void 0 ? void 0 : opts.localMeta;
-        // 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

@@ -65,7 +65,6 @@ class Msg {
         this.msgFS = msgFS;
         this.sendingProc = new synced_1.SingleProc();
         this.completionPromise = undefined;
-        // private readonly progressSavingProc = new SingleProc();
         this.cancelled = false;
         this.sender = undefined;
         this.recipients = undefined;
@@ -128,11 +127,7 @@ 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) {
-            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));
+            await this.attachments.linkIn(this.msgFS);
         }
     }
     notifyOfChangesInProgress(saveProgress, saveWIPs) {
@@ -193,8 +188,6 @@ 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

@@ -80,7 +80,6 @@ class WIP {
      * or if this wip is done, undefined is returned.
      */
     startNext() {
-        var _a, _b;
         let proc = this.proc.latestTaskAtThisMoment();
         if (proc) {
             return;
@@ -102,13 +101,9 @@ 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 {
@@ -164,8 +159,6 @@ 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);
@@ -262,8 +255,6 @@ class WIP {
             throw new Error(`Message pack is not set.`);
         }
         this.state.session = await this.sender.sendMetadata(this.state.pack.meta);
-        // 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";
@@ -317,9 +308,6 @@ 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;
@@ -339,17 +327,12 @@ 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();
             }
@@ -377,8 +360,6 @@ 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();
@@ -410,8 +391,6 @@ 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;
     }
     /**
@@ -421,16 +400,12 @@ 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
@@ -450,8 +425,6 @@ 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

@@ -4,6 +4,7 @@ import { FolderInJSON } from '../../../lib-client/xsp-fs/common';
 import { MsgEnvelope, SuggestedNextKeyPair, SendingParams } from './common';
 import { Encryptor } from '../../../lib-common/async-cryptor-wrap';
 import { AsyncRNG } from '../../../lib-common/rng-def';
+import type { Attachments } from '../delivery/common';
 type FS = web3n.files.FS;
 type AttachmentsContainer = web3n.asmail.AttachmentsContainer;
 type PKeyCertChain = web3n.keys.PKeyCertChain;
@@ -119,10 +120,7 @@ export declare class MsgPacker {
     setNewKeyInfo(recipientKid: string, senderPKey: string, pkeyCerts: PKeyCertChain, msgCount: number): void;
     setNextCrypto(pair: SuggestedNextKeyPair): void;
     setNextSendingParams(params: SendingParams): void;
-    setAttachments(att: {
-        fs: FS | undefined;
-        container: AttachmentsContainer | undefined;
-    }): Promise<void>;
+    setAttachments({ fs, container }: Attachments): Promise<void>;
     private throwupOnMissingParts;
     getSrcForMainObj(msgKeyEnc: Encryptor, cryptor: AsyncSBoxCryptor): Promise<ObjSource>;
     private getFileByteSrc;

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

@@ -153,7 +153,7 @@ class MsgPacker {
             const fPath = appendedPath(fsPath, fName);
             if (entry.isFile) {
                 await fs.readonlyFile(fName);
-                this.addFileInto(folder, fName, fPath);
+                await this.addFileInto(folder, fName, fPath);
             }
             else if (entry.isFolder) {
                 const f = await fs.readonlySubRoot(fName);
@@ -281,7 +281,7 @@ class MsgPacker {
     setNextSendingParams(params) {
         this.main['Flow Params'].nextSendingParams = params;
     }
-    async setAttachments(att) {
+    async setAttachments({ fs, container }) {
         this.throwIfAlreadyPacked();
         if (this.hasAttachments) {
             throw new Error(`Attachments are already set.`);
@@ -290,29 +290,29 @@ class MsgPacker {
         const attachments = { nodes: {}, ctime: Date.now() };
         // populate attachments json
         const path = { start: 'attachments', path: [] };
-        if (att.container && !(0, attachments_container_1.isContainerEmpty)(att.container)) {
-            for (const f of (0, attachments_container_1.iterFilesIn)(att.container)) {
+        if (container && !(0, attachments_container_1.isContainerEmpty)(container)) {
+            for (const f of (0, attachments_container_1.iterFilesIn)(container)) {
                 const filePath = appendedPath(path, f.fileName);
-                this.addFileInto(attachments, f.fileName, filePath);
+                await this.addFileInto(attachments, f.fileName, filePath);
             }
-            for (const f of (0, attachments_container_1.iterFoldersIn)(att.container)) {
+            for (const f of (0, attachments_container_1.iterFoldersIn)(container)) {
                 const fsPath = appendedPath(path, f.folderName);
                 await this.addFolderInto(attachments, f.folderName, f.folder, fsPath);
             }
-            this.attachmentsCont = att.container;
+            this.attachmentsCont = container;
             this.hasAttachments = true;
         }
-        else if (att.fs) {
-            const list = await att.fs.listFolder('.');
+        else if (fs) {
+            const list = await fs.listFolder('.');
             if (list.length > 0) {
                 for (const entry of list) {
                     const fName = entry.name;
                     const fPath = appendedPath(path, fName);
                     if (entry.isFile) {
-                        this.addFileInto(attachments, fName, fPath);
+                        await this.addFileInto(attachments, fName, fPath);
                     }
                     else if (entry.isFolder) {
-                        const f = await att.fs.readonlySubRoot(fName);
+                        const f = await fs.readonlySubRoot(fName);
                         await this.addFolderInto(attachments, fName, f, fPath);
                     }
                     else {
@@ -320,7 +320,7 @@ class MsgPacker {
                         continue;
                     }
                 }
-                this.attachmentsFS = att.fs;
+                this.attachmentsFS = fs;
                 this.hasAttachments = true;
             }
         }
@@ -331,8 +331,6 @@ 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) {

package/package.json

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