core-3nweb-client-lib 0.49.6 → 0.49.8

package/build/core/asmail/inbox/msg-on-disk.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2019 3NSoft Inc.
+ Copyright (C) 2016 - 2019, 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
@@ -27,7 +27,6 @@ const STATUS_FNAME = 'status.json';
 function makeInitMsgStatus(msgId, meta) {
     return {
         msgId,
-        keyStatus: 'not-checked',
         onDisk: false,
         mainObjId: meta.extMeta.objIds[0],
         deliveryTS: meta.deliveryStart
@@ -75,8 +74,7 @@ class MsgOnDisk {
             throw new Error(`Obj ${objId} not present in message ${this.msgId}`);
         }
         const path = this.objFilePath(objId);
-        const isOnDisk = !!(await fs.stat(path)
-            .catch((exc) => {
+        const isOnDisk = !!(await fs.stat(path).catch((exc) => {
             if (exc.notFound) {
                 return;
             }
@@ -95,26 +93,6 @@ class MsgOnDisk {
     get deliveryTS() {
         return this.status.deliveryTS;
     }
-    get keyStatus() {
-        return this.status.keyStatus;
-    }
-    updateMsgKeyStatus(newStatus) {
-        return this.syncProc.startOrChain(async () => {
-            if (this.status.keyStatus === 'not-checked') {
-                this.status.keyStatus = newStatus;
-            }
-            else if (this.status.keyStatus === newStatus) {
-                return;
-            }
-            else {
-                throw Error(`Message has key status ${this.status.keyStatus}, and can't be updated to ${newStatus}`);
-            }
-            await this.saveStatusToDisk();
-        });
-    }
-    async saveStatusToDisk() {
-        await writeJSON(this.msgFolderPath, STATUS_FNAME, this.status);
-    }
 }
 exports.MsgOnDisk = MsgOnDisk;
 Object.freeze(MsgOnDisk.prototype);

package/build/core/asmail/index.js

@@ -49,7 +49,7 @@ class ASMail {
             this.keyring = keyring;
             await this.setupSendingParams(syncedFS);
             await Promise.all([
-                this.setupInbox(syncedFS, getSigner, getStorages, makeResolver),
+                this.setupInbox(syncedFS, localFS, getSigner, getStorages, makeResolver),
                 this.setupDelivery(localFS, getSigner, makeResolver)
             ]);
             await (0, fs_sync_utils_1.uploadFolderChangesIfAny)(syncedFS);
@@ -61,7 +61,7 @@ class ASMail {
         }
     }
     async setupSendingParams(syncedFS) {
-        const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, SEND_PARAMS_DATA_FOLDER);
+        const fs = await (0, fs_sync_utils_1.getOrMakeSyncedDirOnInit)(syncedFS, SEND_PARAMS_DATA_FOLDER);
         this.sendingParams = await sending_params_1.SendingParamsHolder.makeAndInit(fs, this.config.makeParamSetterAndGetter('anon-sender/invites'), this.random);
     }
     async setupDelivery(localFS, getSigner, makeResolver) {
@@ -75,8 +75,8 @@ class ASMail {
             midResolver: makeResolver('mailerid', this.logger.logError),
             correspondents: {
                 needIntroKeyFor: this.keyring.needIntroKeyFor,
-                generateKeysToSend: this.keyring.generateKeysToSend,
-                nextCrypto: this.keyring.nextCrypto,
+                generateIntroKeysToSendMsg: this.keyring.generateIntroKeysToSendMsg,
+                getEstablishedKeysToSendMsg: this.keyring.getEstablishedKeysToSendMsg,
                 paramsForSendingTo: this.sendingParams.otherSides.get,
                 newParamsForSendingReplies: this.sendingParams.thisSide.getUpdated
             },
@@ -86,10 +86,11 @@ class ASMail {
             logWarning: this.logger.logWarning
         });
     }
-    async setupInbox(syncedFS, getSigner, getStorages, makeResolver) {
+    async setupInbox(syncedFS, localFS, getSigner, getStorages, makeResolver) {
         const cachePath = this.inboxPathForUser(this.address);
-        const inboxSyncedFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, INBOX_DATA_FOLDER);
-        this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxSyncedFS, {
+        const inboxSyncedFS = await (0, fs_sync_utils_1.getOrMakeSyncedDirOnInit)(syncedFS, INBOX_DATA_FOLDER);
+        const inboxLocalFS = await localFS.writableSubRoot(INBOX_DATA_FOLDER);
+        this.inbox = await (0, inbox_1.makeInboxOnServer)(cachePath, inboxSyncedFS, inboxLocalFS, {
             address: this.address,
             cryptor: this.cryptor,
             random: this.random,

package/build/core/asmail/msg/common.d.ts

@@ -38,7 +38,6 @@ export interface MsgEnvelope {
 export interface SuggestedNextKeyPair {
     pids: string[];
     senderKid: string;
-    isSenderIntroKey?: boolean;
     recipientPKey: JsonKeyShort;
     timestamp: number;
 }

package/build/core/asmail/msg/common.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020, 2022, 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

package/build/core/index.js

@@ -38,12 +38,12 @@ class Core {
         this.appDirs = appDirs;
         this.logger = logger;
         this.signUpUrl = signUpUrl;
+        this.keyrings = undefined;
         this.idManager = undefined;
         this.closingProc = undefined;
         this.isInitialized = false;
         this.cryptor = makeCryptor(this.logger.logError, this.logger.logWarning);
         this.storages = new storage_1.Storages(this.cryptor.cryptor.sbox, this.random, this.appDirs.storagePathFor);
-        this.keyrings = new keyring_1.Keyrings(this.cryptor.cryptor.sbox, this.random, this.logger);
         this.asmail = new asmail_1.ASMail(this.cryptor.cryptor.sbox, this.random, this.makeNet, this.appDirs.inboxPathFor, this.logger);
         Object.seal(this);
     }
@@ -265,9 +265,10 @@ class Core {
         }
     }
     makeKeyringsCAP(requestedCAPs) {
+        var _a;
         if (requestedCAPs.keyrings
             && (requestedCAPs.keyrings === 'all')) {
-            return this.keyrings.makeKeyringsCAP();
+            return (_a = this.keyrings) === null || _a === void 0 ? void 0 : _a.makeKeyringsCAP();
         }
         else {
             return undefined;
@@ -292,9 +293,10 @@ class Core {
     async close() {
         if (!this.closingProc) {
             this.closingProc = (async () => {
+                var _a;
                 if (this.isInitialized) {
                     await this.asmail.close();
-                    await this.keyrings.close();
+                    await ((_a = this.keyrings) === null || _a === void 0 ? void 0 : _a.close());
                     await this.storages.close();
                     this.asmail = undefined;
                     this.keyrings = undefined;
@@ -323,7 +325,8 @@ class Core {
             const asmailServerConfig = new config_1.ConfigOfASMailServer(address, getSigner, this.makeResolver('asmail', this.logger.logError), this.makeNet());
             emitBootEvent({ coreApp: constants_1.KEYRINGS_APP_NAME, message: `starting initialization` });
             const keyringsSyncedFS = await this.storages.makeSyncedFSForApp(constants_1.KEYRINGS_APP_NAME);
-            await this.keyrings.init(keyringsSyncedFS, this.idManager.getSigner, asmailServerConfig.makeParamSetterAndGetter('init-pub-key'));
+            const keyringsLocalFS = await this.storages.makeLocalFSForApp(constants_1.KEYRINGS_APP_NAME);
+            this.keyrings = await (0, keyring_1.makeKeyrings)(this.cryptor.cryptor.sbox, this.random, this.logger, keyringsSyncedFS, keyringsLocalFS, this.idManager.getSigner, asmailServerConfig.makeParamSetterAndGetter('init-pub-key'));
             emitBootEvent({ coreApp: constants_1.KEYRINGS_APP_NAME, message: `✔️  initialized` });
             emitBootEvent({ coreApp: constants_1.ASMAIL_APP_NAME, message: `starting initialization` });
             const inboxSyncedFS = await this.storages.makeSyncedFSForApp(constants_1.ASMAIL_APP_NAME);

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

@@ -4,6 +4,7 @@ type JsonKeyShort = web3n.keys.JsonKeyShort;
 export type MsgKeyRole = 'suggested' | 'in_use' | 'old' | 'published_intro' | 'prev_published_intro' | 'introductory';
 export declare const KID_LENGTH = 16;
 export declare const PID_LENGTH = 2;
+export declare const MIN_PERIOD_FOR_PAIR: number;
 export interface JWKeyPair {
     skey: JsonKey;
     pkey: JsonKey;

package/build/core/keyring/common.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KEY_USE = exports.PID_LENGTH = exports.KID_LENGTH = void 0;
+exports.KEY_USE = exports.MIN_PERIOD_FOR_PAIR = exports.PID_LENGTH = exports.KID_LENGTH = void 0;
 exports.generateKeyPair = generateKeyPair;
 exports.generateSymmetricKey = generateSymmetricKey;
 exports.extractSKeyBytes = extractSKeyBytes;
@@ -31,6 +31,7 @@ const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const rng_def_1 = require("../../lib-common/rng-def");
 exports.KID_LENGTH = 16;
 exports.PID_LENGTH = 2;
+exports.MIN_PERIOD_FOR_PAIR = 15 * 60 * 1000;
 exports.KEY_USE = {
     PUBLIC: 'asmail-pub-key',
     SECRET: 'asmail-sec-key',

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

@@ -1,4 +1,3 @@
-import { IdToEmailMap } from './id-to-email-map';
 import { MsgKeyRole } from './common';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { ResourcesForSending } from '../asmail/delivery/common';
@@ -28,49 +27,13 @@ type SendingResources = ResourcesForSending['correspondents'];
 type ReceptionResources = ResourcesForReceiving['correspondents'];
 export interface KeyringForASMail {
     needIntroKeyFor: SendingResources['needIntroKeyFor'];
-    generateKeysToSend: SendingResources['generateKeysToSend'];
-    nextCrypto: SendingResources['nextCrypto'];
+    generateIntroKeysToSendMsg: SendingResources['generateIntroKeysToSendMsg'];
+    getEstablishedKeysToSendMsg: SendingResources['getEstablishedKeysToSendMsg'];
     decrypt: ReceptionResources['msgDecryptor'];
     close(): Promise<void>;
 }
-export interface KeyPairsStorage {
-    pairIdToEmailMap: IdToEmailMap;
-    saveChanges: () => void;
-}
-export declare class Keyrings {
-    private readonly cryptor;
-    private readonly random;
-    private readonly logger;
-    /**
-     * This is a map from correspondents' canonical addresses to key objects.
-     */
-    private readonly corrKeys;
-    readonly pairIdToEmailMap: IdToEmailMap;
-    private readonly workLabel;
-    private storage;
-    private publishedKeys;
-    constructor(cryptor: AsyncSBoxCryptor, random: AsyncRNG, logger: Logger);
-    private readonly asKeyPairsStorage;
-    private addCorrespondent;
-    init(fs: WritableFS, getSigner: GetSigner, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<void>;
-    forASMail(): KeyringForASMail;
-    private saveChanges;
-    private needIntroKeyFor;
-    private generateKeysToSend;
-    private nextCrypto;
-    private decryptMsgKeyWithIntroPair;
-    private findEstablishedReceptionPairs;
-    private decryptMsgKeyWithEstablishedPair;
-    /**
-     * This method updates message counts and a timestamp in a given reception
-     * pair.
-     * @param rp is a sending pair, in which changes should be done. Note this
-     * must be a shared structure at this point, not a copy of a pair.
-     * @param msgCount is a message count that should be added to the pair.
-     */
-    private updateReceivedMsgCountIn;
-    private absorbSuggestedNextKeyPair;
-    private decrypt;
-    close(): Promise<void>;
-    makeKeyringsCAP(): Service;
-}
+export declare function makeKeyrings(cryptor: AsyncSBoxCryptor, random: AsyncRNG, logger: Logger, fs: WritableFS, localFS: WritableFS, getSigner: GetSigner, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<{
+    close: () => Promise<void>;
+    makeKeyringsCAP: () => Service;
+    forASMail: () => KeyringForASMail;
+}>;