core-3nweb-client-lib 0.41.7 → 0.41.8

package/build/core/index.js

@@ -42,7 +42,7 @@ class Core {
         this.isInitialized = false;
         this.cryptor = makeCryptor(this.logger.logError, this.logger.logWarning);
         this.storages = new storage_1.Storages(this.cryptor.cryptor.sbox, this.appDirs.storagePathFor);
-        this.keyrings = new keyring_1.Keyrings(this.cryptor.cryptor.sbox);
+        this.keyrings = new keyring_1.Keyrings(this.cryptor.cryptor.sbox, this.logger);
         this.asmail = new asmail_1.ASMail(this.cryptor.cryptor.sbox, this.makeNet, this.appDirs.inboxPathFor, this.logger);
         Object.seal(this);
     }

package/build/core/keyring/index.d.ts

@@ -5,6 +5,7 @@ import { ResourcesForSending } from '../asmail/delivery/common';
 import { ResourcesForReceiving } from '../asmail/inbox';
 import { GetSigner } from '../id-manager';
 import { ParamOnServer } from '../../lib-client/asmail/service-config';
+import { Logger } from '../../lib-client/logging/log-to-file';
 export { KEY_USE, MsgKeyRole } from './common';
 export interface MsgKeyInfo {
     correspondent: string;
@@ -37,6 +38,7 @@ export interface KeyPairsStorage {
 }
 export declare class Keyrings {
     private readonly cryptor;
+    private readonly logger;
     /**
      * This is a map from correspondents' canonical addresses to key objects.
      */
@@ -45,7 +47,7 @@ export declare class Keyrings {
     private readonly workLabel;
     private storage;
     private publishedKeys;
-    constructor(cryptor: AsyncSBoxCryptor);
+    constructor(cryptor: AsyncSBoxCryptor, logger: Logger);
     private readonly asKeyPairsStorage;
     private addCorrespondent;
     init(fs: WritableFS, getSigner: GetSigner, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<void>;

package/build/core/keyring/index.js

@@ -34,8 +34,9 @@ Object.defineProperty(exports, "KEY_USE", { enumerable: true, get: function () {
 const FILE_FOR_INTRO_KEY_ON_SERVER = 'introductory-keys/published-on-server.json';
 // XXX Keyring is just a storage and crypto functionality around keys
 class Keyrings {
-    constructor(cryptor) {
+    constructor(cryptor, logger) {
         this.cryptor = cryptor;
+        this.logger = logger;
         /**
          * This is a map from correspondents' canonical addresses to key objects.
          */
@@ -245,20 +246,32 @@ class Keyrings {
     }
     absorbSuggestedNextKeyPair(correspondent, pair) {
         let ck = this.corrKeys.get(correspondent);
-        if (ck) {
-            ck.ratchetUpSendingPair(pair);
+        if (!ck) {
+            ck = this.addCorrespondent(correspondent);
         }
-        else {
-            if (!pair.isSenderIntroKey) {
-                throw new Error(`Expected addition of correspondent to be done, when new `);
-            }
+        if (pair.isSenderIntroKey) {
             const usedIntro = this.publishedKeys.find(pair.senderKid);
             if (!usedIntro) {
                 throw new Error(`Recently used published intro key is not found`);
             }
-            ck = this.addCorrespondent(correspondent);
             ck.ratchetUpSendingPair(pair, usedIntro.pair);
         }
+        else {
+            ck.ratchetUpSendingPair(pair);
+        }
+        // if (ck) {
+        // 	ck.ratchetUpSendingPair(pair);
+        // } else {
+        // 	if (!pair.isSenderIntroKey) {
+        // 		throw new Error(`Expected addition of correspondent to be done, when new `);
+        // 	}
+        // 	const usedIntro = this.publishedKeys.find(pair.senderKid);
+        // 	if (!usedIntro) {
+        // 		throw new Error(`Recently used published intro key is not found`);
+        // 	}
+        // 	ck = this.addCorrespondent(correspondent);
+        // 	ck.ratchetUpSendingPair(pair, usedIntro.pair);
+        // }
         this.saveChanges();
     }
     async decrypt(msgMeta, getMainObjHeader, getOpenedMsg, checkMidKeyCerts) {
@@ -299,15 +312,20 @@ class Keyrings {
         // absorb next crypto
         const pair = openedMsg.nextCrypto;
         if (pair) {
-            if (msgMeta.recipientKid) {
-                if (!pair.isSenderIntroKey) {
-                    throw new Error(`Introductory message is not referencing used intro key in the next crypto`);
-                }
-                if (msgMeta.recipientKid !== pair.senderKid) {
-                    throw new Error(`Introductory message is referencing wrong key in the next crypto`);
+            try {
+                if (msgMeta.recipientKid) {
+                    if (!pair.isSenderIntroKey) {
+                        throw new Error(`Introductory message is not referencing used intro key in the next crypto`);
+                    }
+                    if (msgMeta.recipientKid !== pair.senderKid) {
+                        throw new Error(`Introductory message is referencing wrong key in the next crypto`);
+                    }
                 }
+                this.absorbSuggestedNextKeyPair(decrInfo.correspondent, pair);
+            }
+            catch (err) {
+                this.logger.logError(err, `Fail to absorb next suggested key for messaging`);
             }
-            this.absorbSuggestedNextKeyPair(decrInfo.correspondent, pair);
         }
         return { decrInfo, openedMsg };
     }

package/package.json

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