core-3nweb-client-lib 0.49.3 → 0.49.5

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

@@ -154,6 +154,11 @@ 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: ${JSON.stringify({
+            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,7 +127,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 +192,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

@@ -164,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);
@@ -191,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);

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,16 +120,13 @@ 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;
     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);
     }
@@ -283,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.`);
@@ -292,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 {
@@ -322,7 +320,7 @@ class MsgPacker {
                         continue;
                     }
                 }
-                this.attachmentsFS = att.fs;
+                this.attachmentsFS = fs;
                 this.hasAttachments = true;
             }
         }
@@ -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/package.json

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