core-3nweb-client-lib 0.50.2 → 0.50.4

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

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

package/build/core/asmail/inbox/inbox-events.js

@@ -87,16 +87,13 @@ class InboxEvents {
     async whenConnected() {
         return this.msgReceiver.connectedState.whenStateIsSet();
     }
-    async getMessage(msgId) {
-        try {
-            return await this.getMsg(msgId);
-        }
-        catch (err) {
-            // XXX we need to skip, if it is a connectivity error here;
-            //     should we remove on non-connectivity error
-            // await this.rmMsg(msgId).catch(noop);
-            await this.logError(err, `Cannot get message ${msgId}`);
-        }
+    getMessage(msgId) {
+        return this.getMsg(msgId).catch(async (exc) => {
+            if ((exc.type === 'connect') || (exc.type === 'inbox')) {
+                return undefined;
+            }
+            await this.logError(exc, `Cannot get message ${msgId}`);
+        });
     }
     subscribe(event, observer) {
         if (event === 'message') {

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

@@ -83,7 +83,7 @@ async function makeInboxOnServer(cachePath, syncedFS, localFS, r) {
         if (msgOnDisk) {
             return msgOnDisk;
         }
-        const meta = await downloader.getMsgMeta(msgId);
+        const meta = await downloader.getMsgMeta(msgId, false);
         return await cache.addMsg(msgId, meta);
     }
     function checkerOfMidKeyCerts(deliveryTS) {
@@ -201,7 +201,9 @@ async function makeInboxOnServer(cachePath, syncedFS, localFS, r) {
             }
             await Promise.all(msgIds.map(msgId => startCachingAndAddKeyToIndex(msgId)
                 .catch(async (exc) => {
-                await logError(exc, `Failed to start caching message ${msgId}`);
+                if (!exc.incompleteDelivery && !exc.msgNotFound) {
+                    await logError(exc, `Failed to start caching message ${msgId}`);
+                }
             })));
             return index.listMsgs(fromTS);
         });
@@ -220,7 +222,12 @@ async function makeInboxOnServer(cachePath, syncedFS, localFS, r) {
             return [];
         }
         // cache and index these
-        await Promise.all(msgIds.map(msgId => startCachingAndAddKeyToIndex(msgId)));
+        await Promise.all(msgIds.map(msgId => startCachingAndAddKeyToIndex(msgId)
+            .catch(async (exc) => {
+            if (!exc.incompleteDelivery && !exc.msgNotFound) {
+                await logError(exc, `Failed to start caching message ${msgId}`);
+            }
+        })));
         // get info's from index, focusing on specific messages only
         return (await index.listMsgs(fromTS)).filter(({ msgId }) => msgIds.includes(msgId));
     }

package/build/core/asmail/inbox/msg-downloader.d.ts

@@ -5,7 +5,7 @@ export declare class MsgDownloader {
     private readonly msgReceiver;
     private readonly runner;
     constructor(msgReceiver: MailRecipient);
-    getMsgMeta(msgId: string): Promise<MsgMeta>;
+    getMsgMeta(msgId: string, allowIncomplete: boolean): Promise<MsgMeta>;
     getObjDownloader(msgId: string): ObjDownloader;
     private getLayoutWithHeaderAndFirstSegs;
     private getSegs;

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

@@ -17,6 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgDownloader = void 0;
+const recipient_1 = require("../../../lib-client/asmail/recipient");
 const obj_on_disk_1 = require("../../../lib-client/objs-on-disk/obj-on-disk");
 const MAX_GETTING_CHUNK = 512 * 1024;
 const DOWNLOAD_START_CHUNK = 128 * 1024;
@@ -26,8 +27,19 @@ class MsgDownloader {
         this.runner = new obj_on_disk_1.DownloadsRunner();
         Object.freeze(this);
     }
-    getMsgMeta(msgId) {
-        return this.msgReceiver.getMsgMeta(msgId);
+    async getMsgMeta(msgId, allowIncomplete) {
+        return await this.msgReceiver.getMsgMeta(msgId, allowIncomplete)
+            .catch(async (exc) => {
+            if (exc.incompleteDelivery) {
+                // cleanout old incomplete messages
+                const deliveryStart = exc.deliveryStart;
+                if (!(Math.abs(Date.now() - deliveryStart) < 12 * 60 * 60 * 1000)) {
+                    await this.msgReceiver.removeMsg(msgId).catch(noop);
+                    throw (0, recipient_1.makeMsgNotFoundException)(msgId);
+                }
+            }
+            throw exc;
+        });
     }
     getObjDownloader(msgId) {
         return {
@@ -52,4 +64,5 @@ class MsgDownloader {
 exports.MsgDownloader = MsgDownloader;
 Object.freeze(MsgDownloader.prototype);
 Object.freeze(MsgDownloader);
+function noop() { }
 Object.freeze(exports);

package/build/core/asmail/inbox/msg-indexing/dataset/v1/sql-db.js

@@ -192,7 +192,7 @@ async function setMsgIndexInfoIntoAttrOf(dbFile, info) {
     });
 }
 function dbFileName(shardTS) {
-    return (shardTS ? LATEST_DB : `${shardTS}${DB_EXT}`);
+    return (shardTS ? `${shardTS}${DB_EXT}` : LATEST_DB);
 }
 function shardTSFromFileName(fName) {
     if (fName.endsWith(DB_EXT)) {

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, deliveryStart: number): 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,17 @@ function makeMsgNotFoundException(msgId) {
     };
     return exc;
 }
+function makeMsgIncompleteException(msgId, deliveryStart) {
+    const exc = {
+        runtimeException: true,
+        type: 'inbox',
+        msgId,
+        incompleteDelivery: true,
+        deliveryStart,
+        stack: (0, runtime_1.getStackHere)(1)
+    };
+    return exc;
+}
 function makeFailToDecryptMsgException(msgId) {
     const exc = {
         runtimeException: true,
@@ -98,14 +110,18 @@ 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 (!rep.data.deliveryCompletion && !allowIncomplete) {
+                const { deliveryStart } = rep.data;
+                throw makeMsgIncompleteException(msgId, deliveryStart);
+            }
+            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.2",
+  "version": "0.50.4",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",