core-3nweb-client-lib 0.50.4 → 0.50.6

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

@@ -169,16 +169,19 @@ async function fileTSsOfDBShards(dbsFS) {
         if (!isFile || !name.endsWith(DB_EXT)) {
             continue;
         }
-        const numStr = name.substring(0, DB_EXT.length);
+        const numStr = name.substring(0, name.length - DB_EXT.length);
         const fileTS = parseInt(numStr);
         if (isNaN(fileTS)) {
             continue;
         }
         fileTSs.push(fileTS);
     }
-    fileTSs.sort();
+    fileTSs.sort(compareNumbers);
     return fileTSs;
 }
+function compareNumbers(a, b) {
+    return a - b;
+}
 const DB_EXT = '.sqlite';
 const LATEST_DB = `latest${DB_EXT}`;
 const MSG_INDEX_DB_ATTR = `msg-index-db`;
@@ -267,7 +270,7 @@ async function makeSqliteDBs(dbsFS) {
     }
     async function* iterateDBsFromLatestToOldest() {
         yield { db: latest };
-        for (let i = (fileTSs.length - 1); i >= 0; i = -1) {
+        for (let i = (fileTSs.length - 1); i >= 0; i -= 1) {
             const fileTS = fileTSs[i];
             if (!fileTS) {
                 continue;
@@ -365,7 +368,7 @@ async function makeSqliteDBs(dbsFS) {
         if (!shardTS) {
             return;
         }
-        for (let i = fileTSs.length; i >= 0; i - 1) {
+        for (let i = fileTSs.length; i >= 0; i -= 1) {
             const ts = fileTSs[i];
             if (ts < shardTS) {
                 fileTSs.slice(i + 1, shardTS);

package/build/core/asmail/sending-params/params-from-others.js

@@ -68,7 +68,10 @@ async function makeParamsFromOthers(fs, fileName) {
             let paramsWhereUpdated = (numExistingRecs > numRemRecs);
             for (const [address, inP] of Object.entries(onRemote)) {
                 const existing = params[address];
-                if (existing.timestamp < inP.timestamp) {
+                if (!existing) {
+                    params[address] = inP;
+                }
+                else if (existing.timestamp < inP.timestamp) {
                     params[address] = inP;
                     paramsWhereUpdated = true;
                 }

package/build/core/keyring/peer-keys/dataset/v2/peer-keys-db.js

@@ -94,8 +94,7 @@ const queryToCreatePeerKeysDbV2 = [
     msgMasterKeyAlg TEXT NOT NULL,
     msgMasterKey BLOB NOT NULL,
     --
-    PRIMARY KEY (peerCAddr, recipientKId, peerKId),
-    UNIQUE (peerCAddr, recipientKId) ON CONFLICT FAIL
+    PRIMARY KEY (peerCAddr, recipientKId, peerKId)
   )
   `,
     `--sql

package/build/core/storage/common/obj-info-file.js

@@ -160,9 +160,12 @@ function addArchived(versions, version) {
         return false;
     }
     versions.archived.push(version);
-    versions.archived.sort();
+    versions.archived.sort(compareNumbers);
     return true;
 }
+function compareNumbers(a, b) {
+    return a - b;
+}
 function isEmptyVersions(versions) {
     if (versions.current) {
         return false;

package/build/tests/caps-api/asmail/specs/send-without-attachments.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 2020, 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -24,7 +24,7 @@ exports.specs = {
     description: '.sendMsg',
     its: []
 };
-const it = {
+let it = {
     expectation: 'send message to existing address and get it'
 };
 it.func = async function (s) {
@@ -87,4 +87,60 @@ it.func = async function (s) {
     await u2_w3n.mail.inbox.removeMsg(msgId); // second call is a noop
 };
 exports.specs.its.push(it);
+it = {
+    expectation: 'send lots of messages with sendImmediately flag set true',
+    timeout: 20000
+};
+it.func = async function (s) {
+    const u1_w3n = s.testAppCapsByUserIndex(0);
+    const u2 = s.users[1];
+    const u2_w3n = s.testAppCapsByUserIndex(1);
+    const totalNumOfTestMsgs = 30;
+    const recipient = u2.userId;
+    const msgsFromRecipient = (0, test_utils_1.getMsgsFrom)(u2_w3n.mail.inbox, totalNumOfTestMsgs);
+    const receivedMsgs = new Array(totalNumOfTestMsgs);
+    const watchingInboxOfU2 = (async function () {
+        for await (const msg of msgsFromRecipient) {
+            const i = msg.jsonBody.testMsgNum;
+            receivedMsgs[i] = msg;
+        }
+    })();
+    const idForSendingPrefix = `${Date.now()}`;
+    const notifs = [];
+    const deliveryProcesses = [];
+    for (let i = 0; i < totalNumOfTestMsgs; i += 1) {
+        const idForSending = `${idForSendingPrefix}-${i}`;
+        const msgNotifs = [];
+        notifs.push(msgNotifs);
+        const outMsg = {
+            msgType: 'mail',
+            jsonBody: {
+                testMsgNum: i
+            }
+        };
+        await u1_w3n.mail.delivery.addMsg([recipient], outMsg, idForSending, {
+            sendImmediately: true,
+            retryRecipient: { numOfAttempts: 2, timeBetweenAttempts: 1000 }
+        });
+        const msgDeliveryProc = new Promise((resolve, reject) => {
+            u1_w3n.mail.delivery.observeDelivery(idForSending, {
+                next: p => msgNotifs.push(p),
+                complete: resolve,
+                error: reject
+            });
+        });
+        deliveryProcesses.push(msgDeliveryProc);
+    }
+    await Promise.allSettled(deliveryProcesses);
+    await watchingInboxOfU2;
+    for (let i = 0; i < totalNumOfTestMsgs; i += 1) {
+        const msgDeliveryNotifs = notifs[i];
+        expect(msgDeliveryNotifs.length).toBeGreaterThan(0);
+        const last = msgDeliveryNotifs[msgDeliveryNotifs.length - 1];
+        expect(last.allDone).withContext(`message ${i} should've been sent without errors`).toBe('all-ok');
+        const msg = receivedMsgs[i];
+        expect(msg.jsonBody.testMsgNum).withContext(`message ${i} should've been received`).toBe(i);
+    }
+};
+exports.specs.its.push(it);
 Object.freeze(exports);

package/build/tests/caps-api/asmail/test-utils.d.ts

@@ -1,5 +1,6 @@
 import { SpecIt as GenericSpecIt } from "../../libs-for-tests/spec-module";
 import { MultiUserSetup } from "../../libs-for-tests/setups";
+type InboxService = web3n.asmail.InboxService;
 type commonW3N = web3n.caps.common.W3N;
 /**
  * This function to be run in renderer's context via execExpects
@@ -9,4 +10,5 @@ type commonW3N = web3n.caps.common.W3N;
 export declare function sendTxtMsg(w3n: commonW3N, recipient: string, txtBody: string): Promise<string>;
 export type SpecIt = GenericSpecIt<MultiUserSetup>;
 export declare function throwDeliveryErrorFrom(lastNotif: web3n.asmail.DeliveryProgress): void;
+export declare function getMsgsFrom(inbox: InboxService, numOfMsgsToGet: number): AsyncGenerator<web3n.asmail.IncomingMessage, void, unknown>;
 export {};

package/build/tests/caps-api/asmail/test-utils.js

@@ -18,8 +18,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendTxtMsg = sendTxtMsg;
 exports.throwDeliveryErrorFrom = throwDeliveryErrorFrom;
+exports.getMsgsFrom = getMsgsFrom;
 const assert_1 = require("../../../lib-common/assert");
 const error_1 = require("../../../lib-common/exceptions/error");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 /**
  * This function to be run in renderer's context via execExpects
  * @param recipient
@@ -58,3 +60,36 @@ function throwDeliveryErrorFrom(lastNotif) {
         }
     }
 }
+async function* getMsgsFrom(inbox, numOfMsgsToGet) {
+    let msgCounter = 0;
+    let expectedMsg = (0, deferred_1.defer)();
+    const unsub = inbox.subscribe('message', {
+        next: msg => {
+            expectedMsg === null || expectedMsg === void 0 ? void 0 : expectedMsg.resolve(msg);
+            msgCounter += 1;
+            expectedMsg = ((msgCounter < numOfMsgsToGet) ? (0, deferred_1.defer)() : undefined);
+        },
+        error: err => {
+            expectedMsg === null || expectedMsg === void 0 ? void 0 : expectedMsg.reject(err);
+            expectedMsg = undefined;
+        },
+        complete: () => {
+            expectedMsg === null || expectedMsg === void 0 ? void 0 : expectedMsg.resolve(undefined);
+            expectedMsg = undefined;
+        }
+    });
+    try {
+        while (expectedMsg) {
+            const msg = await (expectedMsg === null || expectedMsg === void 0 ? void 0 : expectedMsg.promise);
+            if (msg) {
+                yield msg;
+            }
+            else {
+                break;
+            }
+        }
+    }
+    finally {
+        unsub();
+    }
+}

package/package.json

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