core-3nweb-client-lib 0.26.1 → 0.27.3

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

@@ -13,9 +13,10 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyRing = void 0;
+exports.KeyRing = exports.KEY_USE = void 0;
 const correspondent_keys_1 = require("./correspondent-keys");
 const id_to_email_map_1 = require("./id-to-email-map");
 const common_1 = require("./common");
@@ -39,11 +40,11 @@ class KeyRing {
         this.pairIdToEmailMap = new id_to_email_map_1.IdToEmailMap();
         this.storage = undefined;
         this.needIntroKeyFor = (address) => {
-            address = canonical_address_1.toCanonicalAddress(address);
+            address = (0, canonical_address_1.toCanonicalAddress)(address);
             return !this.corrKeys.has(address);
         };
         this.generateKeysToSend = async (address, introPKeyFromServer) => {
-            address = canonical_address_1.toCanonicalAddress(address);
+            address = (0, canonical_address_1.toCanonicalAddress)(address);
             let ck = this.corrKeys.get(address);
             if (!ck) {
                 if (!introPKeyFromServer) {
@@ -54,12 +55,12 @@ class KeyRing {
             const { msgMasterKey, currentPair, msgCount } = await ck.getSendingPair(introPKeyFromServer);
             // prepare message encryptor
             const nextNonce = await random.bytes(xsp_files_1.NONCE_LENGTH);
-            const encryptor = async_cryptor_wrap_1.makeEncryptor(this.cryptor, msgMasterKey, nextNonce);
+            const encryptor = (0, async_cryptor_wrap_1.makeEncryptor)(this.cryptor, msgMasterKey, nextNonce);
             msgMasterKey.fill(0);
             return { encryptor, currentPair, msgCount };
         };
         this.nextCrypto = async (address) => {
-            address = canonical_address_1.toCanonicalAddress(address);
+            address = (0, canonical_address_1.toCanonicalAddress)(address);
             let ck = this.corrKeys.get(address);
             if (!ck) {
                 throw new Error(`No correspondent keys found for ${address}`);
@@ -91,11 +92,11 @@ class KeyRing {
                 if (pkey.k !== msgMeta.senderPKey) {
                     throw new Error(`Key certificates in the message are not for a key that encrypted this message.`);
                 }
-                decrInfo.correspondent = canonical_address_1.toCanonicalAddress(address);
+                decrInfo.correspondent = (0, canonical_address_1.toCanonicalAddress)(address);
             }
             // check that sender is the same as the trusted correspondent
             const sender = openedMsg.sender;
-            if (!sender || !canonical_address_1.areAddressesEqual(sender, decrInfo.correspondent)) {
+            if (!sender || !(0, canonical_address_1.areAddressesEqual)(sender, decrInfo.correspondent)) {
                 throw new Error(`Mismatch between message sender field '${sender}', and address '${decrInfo.correspondent}', associated with decrypting key.`);
             }
             // update received msg counts and a time stamp
@@ -137,7 +138,7 @@ class KeyRing {
         if (this.storage) {
             throw new Error("Keyring has already been initialized.");
         }
-        this.storage = keyring_storage_1.makeKeyringStorage(fs);
+        this.storage = (0, keyring_storage_1.makeKeyringStorage)(fs);
         await this.storage.start();
         const serialForm = await this.storage.load();
         if (serialForm) {
@@ -175,11 +176,11 @@ class KeyRing {
             return;
         }
         const h = await getMainObjHeader();
-        const msgKeyPackLen = common_1.msgKeyPackSizeFor(recipKey.pair.skey.alg);
+        const msgKeyPackLen = (0, common_1.msgKeyPackSizeFor)(recipKey.pair.skey.alg);
         if (h.length < msgKeyPackLen) {
             return;
         }
-        const masterDecr = correspondent_keys_1.msgMasterDecryptor(this.cryptor, recipKey.pair.skey, { kid: '', k: senderPKey });
+        const masterDecr = (0, correspondent_keys_1.msgMasterDecryptor)(this.cryptor, recipKey.pair.skey, { kid: '', k: senderPKey });
         try {
             const mainObjFileKey = await masterDecr.open(h.subarray(0, msgKeyPackLen));
             const info = {
@@ -232,7 +233,7 @@ class KeyRing {
         const h = await getMainObjHeader();
         for (const { correspondent, pair, role } of pairs) {
             const masterKey = buffer_utils_1.base64.open(pair.msgMasterKey);
-            const masterDecr = async_cryptor_wrap_1.makeDecryptor(this.cryptor, masterKey);
+            const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(this.cryptor, masterKey);
             masterKey.fill(0);
             try {
                 const msgKeyPackLen = msgKeyPackLenForPair(pair);
@@ -278,7 +279,7 @@ class KeyRing {
         if (!rp.receivedMsgs) {
             rp.receivedMsgs = { counts: [], lastTS };
         }
-        common_2.addToNumberLineSegments(rp.receivedMsgs.counts, msgCount);
+        (0, common_2.addToNumberLineSegments)(rp.receivedMsgs.counts, msgCount);
         rp.receivedMsgs.lastTS = lastTS;
         this.saveChanges();
     }
@@ -308,6 +309,6 @@ exports.KeyRing = KeyRing;
 Object.freeze(KeyRing.prototype);
 Object.freeze(KeyRing);
 function msgKeyPackLenForPair(p) {
-    return common_1.msgKeyPackSizeFor(p.recipientKey.skey.alg);
+    return (0, common_1.msgKeyPackSizeFor)(p.recipientKey.skey.alg);
 }
 Object.freeze(exports);

package/build/core/asmail/keyring/keyring-storage.js

@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeKeyringStorage = void 0;
 const synced_1 = require("../../../lib-common/processes/synced");

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

@@ -77,8 +77,8 @@ Object.freeze(OpenedMsg);
 async function openMsg(msgId, mainObjId, mainObj, headerOfs, fKey, cryptor) {
     try {
         const header = await mainObj.readHeader();
-        const segReader = await xsp_files_1.makeSegmentsReader(fKey, xsp_files_1.idToHeaderNonce(mainObjId), 0, header.subarray(headerOfs), cryptor);
-        const byteSrc = await xsp_files_1.makeDecryptedByteSource(mainObj.segSrc, segReader);
+        const segReader = await (0, xsp_files_1.makeSegmentsReader)(fKey, (0, xsp_files_1.idToHeaderNonce)(mainObjId), 0, header.subarray(headerOfs), cryptor);
+        const byteSrc = await (0, xsp_files_1.makeDecryptedByteSource)(mainObj.segSrc, segReader);
         const bytes = await byteSrc.read(undefined);
         if (!bytes) {
             throw new Error(`End of bytes is reached too soon`);
@@ -87,7 +87,7 @@ async function openMsg(msgId, mainObjId, mainObj, headerOfs, fKey, cryptor) {
         return new OpenedMsg(msgId, jsonOfMain);
     }
     catch (err) {
-        throw error_1.errWithCause(err, `Cannot open main object of message ${msgId}`);
+        throw (0, error_1.errWithCause)(err, `Cannot open main object of message ${msgId}`);
     }
 }
 exports.openMsg = openMsg;

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

@@ -97,7 +97,7 @@ class MsgPacker {
         const packer = new MsgPacker(segSizeIn256bs);
         packer.readyPack = p;
         packer.mainObjId = p.meta.objIds[0];
-        Object.values(json_utils_1.copy(p.objs))
+        Object.values((0, json_utils_1.copy)(p.objs))
             .forEach(obj => {
             packer.allObjs.set(obj.id, obj);
             turnKeyStingsToBytes(obj);
@@ -286,12 +286,12 @@ class MsgPacker {
         const attachments = { nodes: {}, ctime: Date.now() };
         // populate attachments json
         const path = { start: 'attachments', path: [] };
-        if (att.container && !attachments_container_1.isContainerEmpty(att.container)) {
-            for (const f of attachments_container_1.iterFilesIn(att.container)) {
+        if (att.container && !(0, attachments_container_1.isContainerEmpty)(att.container)) {
+            for (const f of (0, attachments_container_1.iterFilesIn)(att.container)) {
                 const filePath = appendedPath(path, f.fileName);
                 this.addFileInto(attachments, f.fileName, filePath);
             }
-            for (const f of attachments_container_1.iterFoldersIn(att.container)) {
+            for (const f of (0, attachments_container_1.iterFoldersIn)(att.container)) {
                 const fsPath = appendedPath(path, f.folderName);
                 await this.addFolderInto(attachments, f.folderName, f.folder, fsPath);
             }
@@ -347,7 +347,7 @@ class MsgPacker {
         }
         const msgKeyPack = await msgKeyEnc.pack(obj.key);
         const bytes = buffer_utils_1.utf8.pack(JSON.stringify(obj.json));
-        const segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
+        const segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
         // make source that inserts message key pack into header
         return makeMainObjSrc(msgKeyPack, bytes, segWriter);
     }
@@ -410,24 +410,24 @@ class MsgPacker {
         // make object segments writer
         let segWriter;
         if (header) {
-            segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'restart', header }, random.bytes, cryptor);
+            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'restart', header }, random.bytes, cryptor);
         }
         else {
-            segWriter = await xsp_files_1.makeSegmentsWriter(obj.key, xsp_files_1.idToHeaderNonce(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
+            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
         }
         // make object source
         let src;
         if (obj.json) {
             const bytes = buffer_utils_1.utf8.pack(JSON.stringify(obj.json));
-            src = await xsp_files_1.makeObjSourceFromArrays(bytes, segWriter);
+            src = await (0, xsp_files_1.makeObjSourceFromArrays)(bytes, segWriter);
         }
         else if (obj.file) {
             const byteSrc = fileSrcToByteSrc(await this.getFileByteSrc(obj.file));
-            src = await xsp_files_1.makeEncryptingObjSource(byteSrc, segWriter);
+            src = await (0, xsp_files_1.makeEncryptingObjSource)(byteSrc, segWriter);
         }
         else if (obj.folder) {
-            const folderBytes = folder_node_serialization_1.serializeFolderInfo(obj.folder);
-            src = await xsp_files_1.makeObjSourceFromArrays(folderBytes, segWriter);
+            const folderBytes = (0, folder_node_serialization_1.serializeFolderInfo)(obj.folder);
+            src = await (0, xsp_files_1.makeObjSourceFromArrays)(folderBytes, segWriter);
         }
         else {
             throw new Error(`Object ${objId} is broken`);
@@ -443,7 +443,7 @@ class MsgPacker {
         meta.objIds = [];
         const objs = {};
         for (const objEntry of this.allObjs) {
-            const obj = json_utils_1.copy(objEntry[1]);
+            const obj = (0, json_utils_1.copy)(objEntry[1]);
             turnKeysToB64(obj);
             objs[objEntry[0]] = obj;
             if (objEntry[0] !== this.mainObjId) {
@@ -460,7 +460,7 @@ exports.MsgPacker = MsgPacker;
 Object.freeze(MsgPacker.prototype);
 Object.freeze(MsgPacker);
 async function makeMainObjSrc(msgKeyPack, content, segWriter) {
-    const src = await xsp_files_1.makeObjSourceFromArrays(content, segWriter);
+    const src = await (0, xsp_files_1.makeObjSourceFromArrays)(content, segWriter);
     const wrap = {
         version: src.version,
         segSrc: src.segSrc,

package/build/core/asmail/sending-params/own-params.js

@@ -51,7 +51,7 @@ class OwnSendingParams extends file_based_json_1.JsonFileProc {
             }
             p = {
                 address,
-                suggested: json_utils_1.copy(this.defaultParams)
+                suggested: (0, json_utils_1.copy)(this.defaultParams)
             };
             p.suggested.timestamp = Date.now();
             this.params.set(p.address, p);
@@ -116,7 +116,7 @@ class OwnSendingParams extends file_based_json_1.JsonFileProc {
         this.defaultParams = json.default;
     }
     async onFileEvent(ev) {
-        if (!ev.isRemote) {
+        if (ev.src === 'local') {
             return;
         }
         if (ev.type === 'removed') {

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

@@ -55,7 +55,7 @@ class ParamsFromOthers extends file_based_json_1.JsonFileProc {
         json.forEach(p => this.params.set(p.address, p));
     }
     async onFileEvent(ev) {
-        if (!ev.isRemote) {
+        if (ev.src === 'local') {
             return;
         }
         if (ev.type === 'removed') {

package/build/core/id-manager/index.d.ts

@@ -0,0 +1,43 @@
+import { user as mid } from '../../lib-common/mid-sigs-NaCl-Ed';
+import { JsonKey } from '../../lib-common/jwkeys';
+import { GenerateKey } from '../sign-in';
+import { LogError, LogWarning } from '../../lib-client/logging/log-to-file';
+import { NetClient } from '../../lib-client/request-utils';
+import { ServiceLocator } from '../../lib-client/service-locator';
+declare type WritableFS = web3n.files.WritableFS;
+/**
+ * This function completes provisioning process, returning a promise, resolvable
+ * to either true, when all is done, or to false, when challenge reply is not
+ * accepted by the server.
+ */
+export interface CompleteProvisioning {
+    keyParams: any;
+    complete(defaultSKey: Uint8Array): Promise<boolean>;
+}
+/**
+ * This returns a promise, resolvable to mailerId signer.
+ */
+export declare type GetSigner = () => Promise<mid.MailerIdSigner>;
+export declare type SetupManagerStorage = (fs: WritableFS, keysToSave?: JsonKey[]) => Promise<void>;
+export declare class IdManager {
+    private readonly store;
+    private readonly makeNet;
+    private readonly midServiceFor;
+    private address;
+    private signer;
+    private provisioningProc;
+    private constructor();
+    static initWithoutStore(address: string, resolver: ServiceLocator, makeNet: () => NetClient, logError: LogError, logWarning: LogWarning): Promise<((midLoginKey: GenerateKey | Uint8Array) => Promise<{
+        idManager: IdManager;
+        setupManagerStorage: SetupManagerStorage;
+    } | undefined>) | undefined>;
+    static initFromCachedStore(address: string, fs: WritableFS, resolver: ServiceLocator, makeNet: () => NetClient, logError: LogError, logWarning: LogWarning): Promise<IdManager | undefined>;
+    private startProvisionWithoutSavedKey;
+    private provisionUsingSavedKey;
+    getId(): string;
+    getSigner: GetSigner;
+    isProvisionedAndValid(): boolean;
+    makeMailerIdCAP(): Service;
+}
+declare type Service = web3n.mailerid.Service;
+export {};

package/build/core/{id-manager.js → id-manager/index.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 - 2021 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020 - 2022 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
@@ -18,24 +18,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdManager = void 0;
 const ecma_nacl_1 = require("ecma-nacl");
-const provisioner_1 = require("../lib-client/mailer-id/provisioner");
-const jwkeys_1 = require("../lib-common/jwkeys");
-const synced_1 = require("../lib-common/processes/synced");
-const login_1 = require("../lib-client/mailer-id/login");
+const provisioner_1 = require("../../lib-client/mailer-id/provisioner");
+const jwkeys_1 = require("../../lib-common/jwkeys");
+const synced_1 = require("../../lib-common/processes/synced");
+const login_1 = require("../../lib-client/mailer-id/login");
+const key_storage_1 = require("./key-storage");
 const CERTIFICATE_DURATION_SECONDS = 16 * 60 * 60;
 const ASSERTION_VALIDITY = 15 * 60;
 const MIN_SECS_LEFT_ASSUMED_OK = 10 * 60;
-const LOGIN_KEY_FILE_NAME = 'login-keys';
 class IdManager {
-    constructor(makeNet, midServiceFor, logError, logWarning, address, localFS) {
+    constructor(store, makeNet, midServiceFor, address) {
+        this.store = store;
         this.makeNet = makeNet;
         this.midServiceFor = midServiceFor;
-        this.logError = logError;
-        this.logWarning = logWarning;
         this.address = address;
         this.signer = undefined;
-        this.localFS = undefined;
-        this.syncedFS = undefined;
         this.provisioningProc = new synced_1.SingleProc();
         this.getSigner = async () => {
             if (!this.address) {
@@ -46,114 +43,46 @@ class IdManager {
             }
             return this.signer;
         };
-        if (localFS) {
-            this.localFS = localFS;
-        }
         Object.seal(this);
     }
-    static async initInOneStepWithoutStore(address, midLoginKey, resolver, makeNet, logError, logWarning) {
-        const stepTwo = await IdManager.initWithoutStore(address, resolver, makeNet, logError, logWarning);
-        if (!stepTwo) {
-            throw new Error(`MailerId server doesn't recognize identity ${address}`);
-        }
-        return stepTwo(midLoginKey);
-    }
     static async initWithoutStore(address, resolver, makeNet, logError, logWarning) {
-        const idManager = new IdManager(makeNet, resolver, logError, logWarning, address);
-        const completion = await idManager.provisionWithGivenKey(address);
-        if (!completion) {
+        const { store, setupManagerStorage } = key_storage_1.IdKeysStorage.makeWithoutStorage(logError, logWarning);
+        const idManager = new IdManager(store, makeNet, resolver, address);
+        const provisioning = await idManager.startProvisionWithoutSavedKey(address);
+        if (!provisioning) {
             return;
         }
         return async (midLoginKey) => {
             const key = ((typeof midLoginKey === 'function') ?
-                await midLoginKey(completion.keyParams) :
+                await midLoginKey(provisioning.keyParams) :
                 midLoginKey);
-            const isDone = await completion.complete(key);
+            const isDone = await provisioning.complete(key);
             key.fill(0);
-            return (isDone ? idManager : undefined);
+            if (!isDone) {
+                return;
+            }
+            return {
+                idManager,
+                setupManagerStorage: (fs, keys) => setupManagerStorage(fs, (keys ? {
+                    address: idManager.address,
+                    keys
+                } : undefined))
+            };
         };
     }
-    static async initFromLocalStore(address, localFS, resolver, makeNet, logError, logWarning) {
-        const idMan = new IdManager(makeNet, resolver, logError, logWarning, address);
-        if (localFS.type !== 'local') {
-            throw new Error(`Expected local storage is typed as ${localFS.type}`);
-        }
-        idMan.localFS = localFS;
+    static async initFromCachedStore(address, fs, resolver, makeNet, logError, logWarning) {
+        const store = key_storage_1.IdKeysStorage.makeWithStorage(fs, logError, logWarning);
+        const idManager = new IdManager(store, makeNet, resolver, address);
         try {
-            await idMan.provisionUsingSavedKey();
+            await idManager.provisionUsingSavedKey();
+            return idManager;
         }
         catch (err) {
             await logError(err, `Can't initialize id manager from local store`);
             return;
         }
-        return idMan;
-    }
-    async ensureLocalCacheOfKeys() {
-        if (!this.localFS || !this.syncedFS) {
-            throw new Error(`Id manager's storages are not set.`);
-        }
-        const keysCached = await this.localFS.checkFilePresence(LOGIN_KEY_FILE_NAME);
-        if (keysCached) {
-            return;
-        }
-        try {
-            const bytes = await this.syncedFS.readBytes(LOGIN_KEY_FILE_NAME);
-            await this.localFS.writeBytes(LOGIN_KEY_FILE_NAME, bytes);
-            bytes.fill(0);
-        }
-        catch (err) {
-            await this.logError(err, `Fail to ensure local cache of MailerId login keys.`);
-        }
-    }
-    async getSavedKey() {
-        if (!this.localFS) {
-            throw new Error(`Id manager's local storage is not set.`);
-        }
-        const json = await this.localFS.readJSONFile(LOGIN_KEY_FILE_NAME).catch(notFoundOrReThrow);
-        if (json) {
-            return json.keys[0];
-        }
-        if (this.syncedFS) {
-            const json = await this.syncedFS.readJSONFile(LOGIN_KEY_FILE_NAME).catch(notFoundOrReThrow);
-            if (json) {
-                await this.ensureLocalCacheOfKeys();
-                return json.keys[0];
-            }
-            else {
-                await this.logWarning(`IdManager: there is no login MailerId login keys`);
-            }
-        }
-        return;
-    }
-    async setStorages(localFS, syncedFS, keysToSave) {
-        if (localFS) {
-            if (localFS.type !== 'local') {
-                throw new Error(`Expected local storage is typed as ${localFS.type}`);
-            }
-            this.localFS = localFS;
-        }
-        else {
-            if (!this.localFS) {
-                throw new Error(`Local storage is not given`);
-            }
-        }
-        if (syncedFS.type !== 'synced') {
-            throw new Error(`Expected synced storage is typed as ${syncedFS.type}`);
-        }
-        this.syncedFS = syncedFS;
-        if (keysToSave) {
-            const json = {
-                address: this.address,
-                keys: keysToSave
-            };
-            await this.localFS.writeJSONFile(LOGIN_KEY_FILE_NAME, json);
-            await this.syncedFS.writeJSONFile(LOGIN_KEY_FILE_NAME, json);
-        }
-        else {
-            await this.ensureLocalCacheOfKeys();
-        }
     }
-    async provisionWithGivenKey(address) {
+    async startProvisionWithoutSavedKey(address) {
         const midUrl = await this.midServiceFor(address);
         const provisioner = new provisioner_1.MailerIdProvisioner(address, midUrl, this.makeNet());
         try {
@@ -199,11 +128,11 @@ class IdManager {
         proc = this.provisioningProc.start(async () => {
             const midUrl = await this.midServiceFor(this.address);
             const provisioner = new provisioner_1.MailerIdProvisioner(this.address, midUrl, this.makeNet());
-            const key = await this.getSavedKey();
+            const key = await this.store.getSavedKey();
             if (!key) {
                 throw new Error(`No saved MailerId login key can be found`);
             }
-            const skey = jwkeys_1.keyFromJson(key, jwkeys_1.use.MID_PKLOGIN, ecma_nacl_1.box.JWK_ALG_NAME, ecma_nacl_1.box.KEY_LENGTH);
+            const skey = (0, jwkeys_1.keyFromJson)(key, jwkeys_1.use.MID_PKLOGIN, ecma_nacl_1.box.JWK_ALG_NAME, ecma_nacl_1.box.KEY_LENGTH);
             const provisioning = await provisioner.provisionSigner(skey.kid);
             this.signer = await provisioning.complete(() => {
                 const dhshared = ecma_nacl_1.box.calc_dhshared_key(provisioning.serverPKey, skey.k);
@@ -242,21 +171,14 @@ class IdManager {
     }
 }
 exports.IdManager = IdManager;
-/**
- * This is a catch callback, which returns undefined on file(folder) not found
- * exception, and re-throws all other exceptions/errors.
- */
-function notFoundOrReThrow(exc) {
-    if (!exc.notFound) {
-        throw exc;
-    }
-}
+Object.freeze(IdManager.prototype);
+Object.freeze(IdManager);
 async function doMidLogin(loginUrl, userId, net, signer) {
-    const { sessionId, redirect } = await login_1.startMidSession(userId, net, loginUrl);
+    const { sessionId, redirect } = await (0, login_1.startMidSession)(userId, net, loginUrl);
     if (!sessionId) {
         throw Error(`Unexpected redirect of MailerId login from ${loginUrl} to ${redirect}`);
     }
-    await login_1.authenticateMidSession(sessionId, signer, net, loginUrl);
+    await (0, login_1.authenticateMidSession)(sessionId, signer, net, loginUrl);
     return sessionId;
 }
 Object.freeze(exports);

package/build/core/id-manager/key-storage.d.ts

@@ -0,0 +1,21 @@
+import { LogError, LogWarning } from "../../lib-client/logging/log-to-file";
+import { JsonKey } from "../../lib-common/jwkeys";
+declare type WritableFS = web3n.files.WritableFS;
+export interface LoginKeysJSON {
+    address: string;
+    keys: JsonKey[];
+}
+export declare class IdKeysStorage {
+    private readonly logError;
+    private readonly logWarning;
+    private fs;
+    private constructor();
+    static makeWithStorage(fs: WritableFS, logError: LogError, logWarning: LogWarning): IdKeysStorage;
+    static makeWithoutStorage(logError: LogError, logWarning: LogWarning): {
+        store: IdKeysStorage;
+        setupManagerStorage: (fs: WritableFS, keysToSave?: LoginKeysJSON) => Promise<void>;
+    };
+    getSavedKey(): Promise<JsonKey | undefined>;
+    private setStorageFS;
+}
+export {};

package/build/core/id-manager/key-storage.js

@@ -0,0 +1,96 @@
+"use strict";
+/*
+ Copyright (C) 2022 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IdKeysStorage = void 0;
+const assert_1 = require("../../lib-common/assert");
+const error_1 = require("../../lib-common/exceptions/error");
+const LOGIN_KEY_FILE_NAME = 'login-keys';
+class IdKeysStorage {
+    constructor(logError, logWarning, fs) {
+        this.logError = logError;
+        this.logWarning = logWarning;
+        this.fs = undefined;
+        if (fs) {
+            (0, assert_1.assert)(fs.type === 'synced');
+            this.fs = fs;
+        }
+        Object.seal(this);
+    }
+    static makeWithStorage(fs, logError, logWarning) {
+        return new IdKeysStorage(logError, logWarning, fs);
+    }
+    static makeWithoutStorage(logError, logWarning) {
+        const store = new IdKeysStorage(logError, logWarning);
+        return {
+            store,
+            setupManagerStorage: (fs, keys) => store.setStorageFS(fs, keys)
+        };
+    }
+    async getSavedKey() {
+        var _a, _b;
+        if (!((_b = (_a = this.fs) === null || _a === void 0 ? void 0 : _a.v) === null || _b === void 0 ? void 0 : _b.sync)) {
+            throw new Error(`Id manager's storages are not set.`);
+        }
+        try {
+            const json = await this.fs.readJSONFile(LOGIN_KEY_FILE_NAME);
+            return json.keys[0];
+        }
+        catch (exc) {
+            if (!exc.notFound) {
+                throw exc;
+            }
+            await this.fs.v.sync.updateStatusInfo('');
+            await this.fs.v.sync.adoptRemote('');
+            if (await this.fs.checkFilePresence(LOGIN_KEY_FILE_NAME)) {
+                return this.getSavedKey();
+            }
+            else {
+                await this.logWarning(`IdManager: no saved login MailerId keys`);
+                return;
+            }
+        }
+    }
+    async setStorageFS(fs, keysToSave) {
+        (0, assert_1.assert)(!this.fs);
+        (0, assert_1.assert)(fs.type === 'synced');
+        this.fs = fs;
+        if (keysToSave) {
+            await this.fs.writeJSONFile(LOGIN_KEY_FILE_NAME, keysToSave);
+            // XXX must add work with not-online condition
+            await this.fs.v.sync.upload(LOGIN_KEY_FILE_NAME);
+            await this.fs.v.sync.upload('');
+        }
+        else {
+            try {
+                await this.fs.readJSONFile(LOGIN_KEY_FILE_NAME);
+            }
+            catch (exc) {
+                throw (0, error_1.errWithCause)(exc, `Fail expection read of login MailerId keys from the storage`);
+            }
+        }
+    }
+}
+exports.IdKeysStorage = IdKeysStorage;
+Object.freeze(IdKeysStorage.prototype);
+Object.freeze(IdKeysStorage);
+function notFoundOrReThrow(exc) {
+    if (!exc.notFound) {
+        throw exc;
+    }
+}
+Object.freeze(exports);

package/build/core/index.d.ts

@@ -8,6 +8,7 @@ export interface CoreConf {
     dataDir: string;
     signUpUrl: string;
 }
+export declare type MakeNet = () => NetClient;
 export declare class Core {
     private readonly makeNet;
     private readonly makeResolver;
@@ -21,7 +22,7 @@ export declare class Core {
     private isInitialized;
     private closingProc;
     private constructor();
-    static make(conf: CoreConf, makeNet: () => NetClient, makeResolver: ServiceLocatorMaker, makeCryptor: makeCryptor): Core;
+    static make(conf: CoreConf, makeNet: MakeNet, makeResolver: ServiceLocatorMaker, makeCryptor: makeCryptor): Core;
     start(): {
         capsForStartup: web3n.startup.W3N;
         coreInit: Promise<string>;