core-3nweb-client-lib 0.50.1 → 0.50.3

package/build/api-defs/asmail.d.ts

@@ -296,6 +296,7 @@ declare namespace web3n.asmail {
 		type: "inbox";
 		msgId: string;
 		msgNotFound?: true;
+		incompleteDelivery?: true;
 		objNotFound?: true;
 		objId?: string;
 		msgIsBroken?: true;

package/build/core/asmail/inbox/msg-downloader.js

@@ -18,6 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgDownloader = void 0;
 const obj_on_disk_1 = require("../../../lib-client/objs-on-disk/obj-on-disk");
+const sleep_1 = require("../../../lib-common/processes/sleep");
 const MAX_GETTING_CHUNK = 512 * 1024;
 const DOWNLOAD_START_CHUNK = 128 * 1024;
 class MsgDownloader {
@@ -26,8 +27,23 @@ class MsgDownloader {
         this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.freeze(this);
     }
-    getMsgMeta(msgId) {
-        return this.msgReceiver.getMsgMeta(msgId);
+    async getMsgMeta(msgId) {
+        let lastExc = undefined;
+        for (let attemptNum = 0; attemptNum < 10; attemptNum += 1) {
+            try {
+                return await this.msgReceiver.getMsgMeta(msgId, false);
+            }
+            catch (exc) {
+                if (exc.incompleteDelivery) {
+                    lastExc = exc;
+                }
+                else {
+                    throw exc;
+                }
+            }
+            await (0, sleep_1.sleep)((attemptNum < 2) ? 500 : attemptNum * 2000);
+        }
+        throw lastExc;
     }
     getObjDownloader(msgId) {
         return {

package/build/core/keyring/peer-keys/index.js

@@ -161,8 +161,14 @@ async function makePeersKeyring(keyringFS, localFS, random, logger) {
             });
         }
         const entryToLog = keysDB.getSendingPair(peerCAddr);
-        await keysDB.saveIfNeeded();
-        await logs.recordGettingCryptoFromPeer(entryToLog, peerAddr);
+        if (entryToLog) {
+            await keysDB.saveIfNeeded();
+            await logs.recordGettingCryptoFromPeer(entryToLog, peerAddr);
+        }
+        else {
+            // XXX we see code come here. sql not recording? why?
+            logger.logError(`Suggested sending pair somehow didn't get into db within this absorbNextPairSuggestedByPeer()`);
+        }
     }
     async function periodicCheckAndUploadOfData() {
         if (logs.numOfLogs() >= NUM_OF_LOGS_TO_START_CUT) {

package/build/lib-client/asmail/recipient.d.ts

@@ -5,6 +5,7 @@ import { SubscribingClient } from '../../lib-common/ipc/ws-ipc';
 type InboxException = web3n.asmail.InboxException;
 type Observer<T> = web3n.Observer<T>;
 export declare function makeMsgNotFoundException(msgId: string): InboxException;
+export declare function makeMsgIncompleteException(msgId: string): InboxException;
 export declare function makeFailToDecryptMsgException(msgId: string): InboxException;
 export declare function makeObjNotFoundException(msgId: string, objId: string): InboxException;
 export declare function makeMsgIsBrokenException(msgId: string): InboxException;
@@ -12,7 +13,7 @@ export declare class MailRecipient extends ServiceUser {
     constructor(user: string, getSigner: IGetMailerIdSigner, mainUrlGetter: () => Promise<string>, net: NetClient);
     getNet(): NetClient;
     listMsgs(fromTS: number | undefined): Promise<api.listMsgs.Reply>;
-    getMsgMeta(msgId: string): Promise<api.MsgMeta>;
+    getMsgMeta(msgId: string, allowIncomplete: boolean): Promise<api.MsgMeta>;
     /**
      * This method returns either first part of message object, or a whole of it,
      * depending on a given limit for segments. Returned promise resolves to a

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

@@ -18,6 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MailRecipient = void 0;
 exports.makeMsgNotFoundException = makeMsgNotFoundException;
+exports.makeMsgIncompleteException = makeMsgIncompleteException;
 exports.makeFailToDecryptMsgException = makeFailToDecryptMsgException;
 exports.makeObjNotFoundException = makeObjNotFoundException;
 exports.makeMsgIsBrokenException = makeMsgIsBrokenException;
@@ -38,6 +39,16 @@ function makeMsgNotFoundException(msgId) {
     };
     return exc;
 }
+function makeMsgIncompleteException(msgId) {
+    const exc = {
+        runtimeException: true,
+        type: 'inbox',
+        msgId,
+        incompleteDelivery: true,
+        stack: (0, runtime_1.getStackHere)(1)
+    };
+    return exc;
+}
 function makeFailToDecryptMsgException(msgId) {
     const exc = {
         runtimeException: true,
@@ -98,14 +109,17 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
             throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
-    async getMsgMeta(msgId) {
+    async getMsgMeta(msgId, allowIncomplete) {
         const rep = await this.doBodylessSessionRequest({
             appPath: api.msgMetadata.genUrlEnd(msgId),
             method: 'GET',
             responseType: 'json'
         });
         if (rep.status === api.msgMetadata.SC.ok) {
-            const { meta, errMsg } = api.sanitizedMeta(rep.data);
+            if (!allowIncomplete && !rep.data.deliveryCompletion) {
+                throw makeMsgIncompleteException(msgId);
+            }
+            const { meta, errMsg } = api.sanitizedMeta(rep.data, allowIncomplete);
             if (!meta) {
                 throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
                     message: `Malformed message metadata in a server response: ${errMsg}`

package/build/lib-common/service-api/asmail/retrieval.d.ts

@@ -74,8 +74,9 @@ export declare namespace msgMetadata {
  * This function returns either a checked version of given meta object, if it
  * passes as message meta, or undefined, otherwise.
  * @param meta is an object that is expected to be message meta
+ * @param allowIncomplete
  */
-export declare function sanitizedMeta(meta: MsgMeta): {
+export declare function sanitizedMeta(meta: MsgMeta, allowIncomplete: boolean): {
     meta?: MsgMeta;
     errMsg?: string;
 };

package/build/lib-common/service-api/asmail/retrieval.js

@@ -94,21 +94,26 @@ Object.freeze(msgMetadata);
  * This function returns either a checked version of given meta object, if it
  * passes as message meta, or undefined, otherwise.
  * @param meta is an object that is expected to be message meta
+ * @param allowIncomplete
  */
-function sanitizedMeta(meta) {
+function sanitizedMeta(meta, allowIncomplete) {
     if (typeof meta !== 'object') {
         return { errMsg: `is not a json object: ${JSON.stringify(meta)}` };
     }
-    if (typeof meta.objs !== 'object') {
-        return { errMsg: `objs field is not an object in: ${JSON.stringify(meta)}` };
-    }
-    for (const objId of Object.keys(meta.objs)) {
-        const st = meta.objs[objId];
-        if (typeof st.size.header !== 'number') {
-            return { errMsg: `obj's header is not a number in: ${JSON.stringify(meta)}` };
+    if (typeof meta.objs === 'object') {
+        for (const objId of Object.keys(meta.objs)) {
+            const st = meta.objs[objId];
+            if (typeof st.size.header !== 'number') {
+                return { errMsg: `obj's header is not a number in: ${JSON.stringify(meta)}` };
+            }
+            if (st.completed && (st.size.segments === undefined)) {
+                return { errMsg: `obj's segments is not a number in: ${JSON.stringify(meta)}` };
+            }
         }
-        if (st.completed && (st.size.segments === undefined)) {
-            return { errMsg: `obj's segments is not a number in: ${JSON.stringify(meta)}` };
+    }
+    else {
+        if (!allowIncomplete) {
+            return { errMsg: `objs field is not an object in: ${JSON.stringify(meta)}` };
         }
     }
     // TODO add more checks and return new object instead of a given one

package/package.json

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