core-3nweb-client-lib 0.27.0 → 0.27.4

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

@@ -18,10 +18,13 @@
 
 declare namespace web3n.files {
 
-	interface FileException extends RuntimeException {
+	interface FileException extends RuntimeException, FileExceptionFlag {
 		type: 'file';
 		code: string|undefined;
 		path: string;
+	}
+
+	interface FileExceptionFlag {
 		notFound?: true;
 		alreadyExists?: true;
 		notDirectory?: true;
@@ -48,19 +51,13 @@ declare namespace web3n.files {
 		alreadyExists: 'EEXIST';
 		notDirectory: 'ENOTDIR';
 		notFile: 'ENOTFILE';
-		notLink: 'not-link';
 		isDirectory: 'EISDIR';
 		notEmpty: 'ENOTEMPTY';
 		endOfFile: 'EEOF';
 		opNotPermitted: 'EPERM';
 		busy: 'EBUSY';
 		ioError: 'EIO';
-		concurrentUpdate: 'concurrent-update';
-		parsingError: 'parsing-error';
 		notImplemented: 'ENOSYS';
-		isEndless: 'is-endless';
-		storageClosed: 'storage-closed';
-		versionMismatch: 'version-mismatch';
 	}
 
 	interface FSSyncException extends RuntimeException {
@@ -423,9 +420,13 @@ declare namespace web3n.files {
 
 	interface ReadonlyFileVersionedAPI {
 
-		getXAttr(xaName: string): Promise<{ attr: any; version: number; }>;
+		getXAttr(
+			xaName: string, flags?: VersionedReadFlags
+		): Promise<{ attr: any; version: number; }>;
 	
-		listXAttrs(): Promise<{ lst: string[]; version: number; }>;
+		listXAttrs(
+			flags?: VersionedReadFlags
+		): Promise<{ lst: string[]; version: number; }>;
 	
 		/**
 		 * This returns a promise, resolvable to either non-empty byte array, or
@@ -436,34 +437,51 @@ declare namespace web3n.files {
 		 * @param end optional parameter, setting an end of read. If end is
 		 * greater than file length, all available bytes are read. If parameter
 		 * is missing, read will be done to file's end.
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
 		readBytes(
-			start?: number, end?: number
+			start?: number, end?: number, flags?: VersionedReadFlags
 		): Promise<{ bytes: Uint8Array|undefined; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to text, read from file, assuming
 		 * utf8 encoding.
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
-		readTxt(): Promise<{ txt: string; version: number; }>;
+		readTxt(
+			flags?: VersionedReadFlags
+		): Promise<{ txt: string; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to json, read from file
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
-		readJSON<T>(): Promise<{ json: T; version: number; }>;
+		readJSON<T>(
+			flags?: VersionedReadFlags
+		): Promise<{ json: T; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to bytes source with seek, which
 		 * allows random reads, and a file version
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
-		getByteSource(): Promise<{ src: FileByteSource; version: number; }>;
+		getByteSource(
+			flags?: VersionedReadFlags
+		): Promise<{ src: FileByteSource; version: number; }>;
 
-		listVersions(): Promise<{ current?: number; archived?: number[]; }>;
+		listVersions(
+			flags?: VersionedReadFlags
+		): Promise<{ current?: number; archived?: number[]; }>;
 
 		sync?: ReadonlyFileSyncAPI;
 
 	}
 
+	interface VersionedReadFlags {
+		archivedVersion?: number;
+		remoteVersion?: number;
+	}
+
 	interface WritableFileVersionedAPI extends ReadonlyFileVersionedAPI {
 
 		/**
@@ -975,7 +993,7 @@ declare namespace web3n.files {
 
 	}
 
-	interface VersionedFileFlags extends FileFlags {
+	interface VersionedFileWriteFlags extends FileFlags {
 
 		/**
 		 * currentVersion flag is optional. This flag is applicable to existing
@@ -989,33 +1007,42 @@ declare namespace web3n.files {
 	interface ReadonlyFSVersionedAPI {
 
 		getXAttr(
-			path: string, xaName: string
+			path: string, xaName: string, flags?: VersionedReadFlags
 		): Promise<{ attr: any; version: number; }>;
 	
-		listXAttrs(path: string): Promise<{ lst: string[]; version: number; }>;
+		listXAttrs(
+			path: string, flags?: VersionedReadFlags
+		): Promise<{ lst: string[]; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to a list of informational objects
 		 * for entries in the folder, and a folder's version.
 		 * @param path of a folder that should be listed
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
 		listFolder(
-			path: string
+			path: string, flags?: VersionedReadFlags
 		): Promise<{ lst: ListingEntry[]; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to json, read from file, and a
 		 * version of file.
 		 * @param path of a file from which to read json
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
-		readJSONFile<T>(path: string): Promise<{ json: T; version: number; }>;
+		readJSONFile<T>(
+			path: string, flags?: VersionedReadFlags
+		): Promise<{ json: T; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to text, read from file, assuming
 		 * utf8 encoding, and version of file.
 		 * @param path of a file from which to read text
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
-		readTxtFile(path: string): Promise<{ txt: string; version: number; }>;
+		readTxtFile(
+			path: string, flags?: VersionedReadFlags
+		): Promise<{ txt: string; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to bytes, that is either non-empty
@@ -1027,18 +1054,21 @@ declare namespace web3n.files {
 		 * @param end optional parameter, setting an end of read. If end is
 		 * greater than file length, all available bytes are read. If parameter
 		 * is missing, read will be done to file's end.
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
 		readBytes(
-			path: string, start?: number, end?: number
+			path: string, start?: number, end?: number,
+			flags?: VersionedReadFlags
 		): Promise<{ bytes: Uint8Array|undefined; version: number; }>;
 
 		/**
 		 * This returns a promise, resolvable to bytes source with seek, which
 		 * allows random reads, and a file version
 		 * @param path of a file from which to read bytes
+		 * @param flags are optional flags to read archived or remote versions.
 		 */
 		getByteSource(
-			path: string
+			path: string, flags?: VersionedReadFlags
 		): Promise<{ src: FileByteSource; version: number; }>;
 
 		listVersions(
@@ -1068,7 +1098,7 @@ declare namespace web3n.files {
 		 * exclusive=false.
 		 */
 		writeJSONFile(
-			path: string, json: any, flags?: VersionedFileFlags
+			path: string, json: any, flags?: VersionedFileWriteFlags
 		): Promise<number>;
 
 		/**
@@ -1080,7 +1110,7 @@ declare namespace web3n.files {
 		 * exclusive=false.
 		 */
 		writeTxtFile(
-			path: string, txt: string, flags?: VersionedFileFlags
+			path: string, txt: string, flags?: VersionedFileWriteFlags
 		): Promise<number>;
 
 		/**
@@ -1092,7 +1122,7 @@ declare namespace web3n.files {
 		 * exclusive=false.
 		 */
 		writeBytes(
-			path: string, bytes: Uint8Array, flags?: VersionedFileFlags
+			path: string, bytes: Uint8Array, flags?: VersionedFileWriteFlags
 		): Promise<number>;
 
 		/**
@@ -1103,7 +1133,7 @@ declare namespace web3n.files {
 		 * exclusive=false, truncate=true.
 		 */
 		getByteSink(
-			path: string, flags?: VersionedFileFlags
+			path: string, flags?: VersionedFileWriteFlags
 		): Promise<{ sink: FileByteSink; version: number; }>;
 
 		archiveCurrent(path: string, version?: number): Promise<number>;

package/build/core/asmail/config/index.d.ts

@@ -35,11 +35,11 @@ export declare class ConfigOfASMailServer {
          * @param kid
          * @return if key is found, object with following fields is returned:
          */
-        find: (kid: string) => undefined | {
+        find: (kid: string) => {
             role: MsgKeyRole;
             pair: JWKeyPair;
             replacedAt?: number;
-        };
+        } | undefined;
     };
     private constructor();
     static makeAndStart(address: string, getSigner: GetSigner, resolver: ServiceLocator, net: NetClient, fs: WritableFS): Promise<ConfigOfASMailServer>;

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

@@ -30,8 +30,8 @@ const INTRO_KEY_FILE = 'introductory-key.json';
 class ConfigOfASMailServer {
     constructor(address, getSigner, resolver, net) {
         const serviceConf = new service_config_1.MailConfigurator(address, getSigner, () => resolver(serviceConf.userId), net);
-        this.anonInvites = new invitations_anon_1.Invites(serviceConf);
-        this.publishedIntroKeys = new published_intro_key_1.PublishedIntroKey(getSigner, serviceConf);
+        this.anonInvites = (0, invitations_anon_1.makeInvites)(serviceConf);
+        this.publishedIntroKeys = (0, published_intro_key_1.makePublishedIntroKey)(getSigner, serviceConf);
         this.anonSenderInvites = {
             getAll: this.anonInvites.getAll,
             create: this.anonInvites.create,

package/build/core/asmail/config/invitations-anon.d.ts

@@ -1,27 +1,13 @@
 import { MailConfigurator } from '../../../lib-client/asmail/service-config';
-import * as api from '../../../lib-common/service-api/asmail/config';
-import { ParamOnFileAndServer } from './common';
-import { ConfigOfASMailServer } from '../config';
-interface InvitesJSON {
-    invites: {
-        [invite: string]: {
-            label: string;
-            msgMaxSize: number;
-        };
-    };
-}
-declare type ExposedFuncs = ConfigOfASMailServer['anonSenderInvites'];
-export declare class Invites extends ParamOnFileAndServer<InvitesJSON, api.InvitesList> {
-    private invites;
-    constructor(serviceConf: MailConfigurator);
-    protected initStruct(): Promise<void>;
-    protected setFromJSON(json: InvitesJSON): void;
-    protected toFileJSON(): InvitesJSON;
-    protected toServiceJSON(): api.InvitesList;
-    getAll: ExposedFuncs['getAll'];
-    create: ExposedFuncs['create'];
-    private generateNewRandomInvite;
-    private findByLabel;
-    setMsgMaxSize: ExposedFuncs['setMsgMaxSize'];
+declare type WritableFile = web3n.files.WritableFile;
+export interface Invites {
+    getAll: () => Map<string, {
+        invite: string;
+        msgMaxSize: number;
+    }>;
+    create: (label: string, msgMaxSize: number) => Promise<string>;
+    setMsgMaxSize: (label: string, msgMaxSize: number) => Promise<void>;
+    start: (file: WritableFile) => Promise<void>;
 }
+export declare function makeInvites(serviceConf: MailConfigurator): Invites;
 export {};

package/build/core/asmail/config/invitations-anon.js

@@ -15,41 +15,25 @@
  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.Invites = void 0;
+exports.makeInvites = void 0;
 const random = require("../../../lib-common/random-node");
 const api = require("../../../lib-common/service-api/asmail/config");
 const common_1 = require("./common");
 const INVITE_TOKEN_LEN = 40;
-class Invites extends common_1.ParamOnFileAndServer {
+function makeInvites(serviceConf) {
+    const invites = new InvitesData(serviceConf);
+    return {
+        create: invites.create.bind(invites),
+        getAll: invites.getAll.bind(invites),
+        setMsgMaxSize: invites.setMsgMaxSize.bind(invites),
+        start: invites.start.bind(invites)
+    };
+}
+exports.makeInvites = makeInvites;
+class InvitesData extends common_1.ParamOnFileAndServer {
     constructor(serviceConf) {
         super(api.p.anonSenderInvites.URL_END, serviceConf);
         this.invites = {};
-        this.getAll = () => {
-            const byLabel = new Map();
-            Object.entries(this.invites)
-                .forEach(([invite, params]) => {
-                byLabel.set(params.label, { invite, msgMaxSize: params.msgMaxSize });
-            });
-            return byLabel;
-        };
-        this.create = async (label, msgMaxSize) => {
-            const existingInvite = this.findByLabel(label);
-            if (existingInvite) {
-                throw new Error(`Anonymous sender invite already exists with label ${label}`);
-            }
-            const invite = await this.generateNewRandomInvite();
-            this.invites[invite] = { label, msgMaxSize };
-            await this.save();
-            return invite;
-        };
-        this.setMsgMaxSize = async (label, msgMaxSize) => {
-            const invite = this.findByLabel(label);
-            if (!invite) {
-                throw new Error(`There is no anonymous sender invite with label ${label}`);
-            }
-            this.invites[invite].msgMaxSize = msgMaxSize;
-            await this.save();
-        };
         Object.seal(this);
     }
     async initStruct() { }
@@ -69,6 +53,26 @@ class Invites extends common_1.ParamOnFileAndServer {
         });
         return serverJSON;
     }
+    getAll() {
+        const byLabel = new Map();
+        Object.entries(this.invites)
+            .forEach(([invite, params]) => {
+            byLabel.set(params.label, { invite, msgMaxSize: params.msgMaxSize });
+        });
+        return byLabel;
+    }
+    ;
+    async create(label, msgMaxSize) {
+        const existingInvite = this.findByLabel(label);
+        if (existingInvite) {
+            throw new Error(`Anonymous sender invite already exists with label ${label}`);
+        }
+        const invite = await this.generateNewRandomInvite();
+        this.invites[invite] = { label, msgMaxSize };
+        await this.save();
+        return invite;
+    }
+    ;
     async generateNewRandomInvite() {
         let invite;
         do {
@@ -81,8 +85,16 @@ class Invites extends common_1.ParamOnFileAndServer {
             .find(([_, params]) => (params.label === label));
         return (found ? found[0] : undefined);
     }
+    async setMsgMaxSize(label, msgMaxSize) {
+        const invite = this.findByLabel(label);
+        if (!invite) {
+            throw new Error(`There is no anonymous sender invite with label ${label}`);
+        }
+        this.invites[invite].msgMaxSize = msgMaxSize;
+        await this.save();
+    }
+    ;
 }
-exports.Invites = Invites;
-Object.freeze(Invites.prototype);
-Object.freeze(Invites);
+Object.freeze(InvitesData.prototype);
+Object.freeze(InvitesData);
 Object.freeze(exports);

package/build/core/asmail/config/published-intro-key.d.ts

@@ -1,28 +1,17 @@
 import { MailConfigurator } from '../../../lib-client/asmail/service-config';
 import * as api from '../../../lib-common/service-api/asmail/config';
 import { GetSigner } from '../../id-manager';
-import { JWKeyPair } from '../keyring/common';
-import { ParamOnFileAndServer } from './common';
-import { ConfigOfASMailServer } from '../config';
+import { JWKeyPair, MsgKeyRole } from '../keyring/common';
+declare type WritableFile = web3n.files.WritableFile;
 export declare type Certs = api.p.initPubKey.Certs;
-interface PublishedIntroKeysJSON {
-    current?: {
-        keyPair: JWKeyPair;
-        certs: Certs;
-    };
-    previous?: JWKeyPair;
-}
-declare type ExposedFuncs = ConfigOfASMailServer['publishedKeys'];
-export declare class PublishedIntroKey extends ParamOnFileAndServer<PublishedIntroKeysJSON, Certs> {
-    private getSigner;
-    private published;
-    constructor(getSigner: GetSigner, serviceConf: MailConfigurator);
-    protected initStruct(): Promise<void>;
-    protected setFromJSON(json: PublishedIntroKeysJSON): void;
-    protected toFileJSON(): PublishedIntroKeysJSON;
-    protected toServiceJSON(): Certs;
-    private makeNewIntroKey;
-    update: ExposedFuncs['update'];
-    find: ExposedFuncs['find'];
+export interface PublishedIntroKey {
+    update: () => Promise<void>;
+    find: (kid: string) => {
+        role: MsgKeyRole;
+        pair: JWKeyPair;
+        replacedAt?: number;
+    } | undefined;
+    start: (file: WritableFile) => Promise<void>;
 }
+export declare function makePublishedIntroKey(getSigner: GetSigner, serviceConf: MailConfigurator): PublishedIntroKey;
 export {};

package/build/core/asmail/config/published-intro-key.js

@@ -15,49 +15,25 @@
  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.PublishedIntroKey = void 0;
+exports.makePublishedIntroKey = void 0;
 const api = require("../../../lib-common/service-api/asmail/config");
 const common_1 = require("../keyring/common");
 const common_2 = require("./common");
 const INTRO_KEY_VALIDITY = 31 * 24 * 60 * 60;
-class PublishedIntroKey extends common_2.ParamOnFileAndServer {
+function makePublishedIntroKey(getSigner, serviceConf) {
+    const published = new PublishedKey(getSigner, serviceConf);
+    return {
+        find: published.find.bind(published),
+        update: published.update.bind(published),
+        start: published.start.bind(published)
+    };
+}
+exports.makePublishedIntroKey = makePublishedIntroKey;
+class PublishedKey extends common_2.ParamOnFileAndServer {
     constructor(getSigner, serviceConf) {
         super(api.p.initPubKey.URL_END, serviceConf);
         this.getSigner = getSigner;
         this.published = undefined;
-        this.update = async () => {
-            const newKey = await this.makeNewIntroKey();
-            if (this.published.current) {
-                this.published.current.keyPair.retiredAt = newKey.pair.createdAt;
-                this.published.previous = this.published.current.keyPair;
-            }
-            this.published.current = {
-                keyPair: newKey.pair,
-                certs: newKey.certs
-            };
-            await this.save();
-        };
-        this.find = (kid) => {
-            // check current key
-            if (this.published.current
-                && (this.published.current.keyPair.skey.kid === kid)) {
-                return {
-                    role: 'published_intro',
-                    pair: this.published.current.keyPair
-                };
-            }
-            // check previous key
-            if (this.published.previous
-                && (this.published.previous.skey.kid === kid)) {
-                return {
-                    role: 'prev_published_intro',
-                    pair: this.published.previous,
-                    replacedAt: this.published.previous.retiredAt
-                };
-            }
-            // if nothing found, explicitly return undefined
-            return;
-        };
         Object.seal(this);
     }
     async initStruct() {
@@ -89,8 +65,41 @@ class PublishedIntroKey extends common_2.ParamOnFileAndServer {
         pair.createdAt = Date.now();
         return { pair, certs };
     }
+    async update() {
+        const newKey = await this.makeNewIntroKey();
+        if (this.published.current) {
+            this.published.current.keyPair.retiredAt = newKey.pair.createdAt;
+            this.published.previous = this.published.current.keyPair;
+        }
+        this.published.current = {
+            keyPair: newKey.pair,
+            certs: newKey.certs
+        };
+        await this.save();
+    }
+    ;
+    find(kid) {
+        // check current key
+        if (this.published.current
+            && (this.published.current.keyPair.skey.kid === kid)) {
+            return {
+                role: 'published_intro',
+                pair: this.published.current.keyPair
+            };
+        }
+        // check previous key
+        if (this.published.previous
+            && (this.published.previous.skey.kid === kid)) {
+            return {
+                role: 'prev_published_intro',
+                pair: this.published.previous,
+                replacedAt: this.published.previous.retiredAt
+            };
+        }
+        // if nothing found, explicitly return undefined
+        return;
+    }
 }
-exports.PublishedIntroKey = PublishedIntroKey;
-Object.freeze(PublishedIntroKey.prototype);
-Object.freeze(PublishedIntroKey);
+Object.freeze(PublishedKey.prototype);
+Object.freeze(PublishedKey);
 Object.freeze(exports);

package/build/core/asmail/inbox/attachments/fs.d.ts

@@ -1,6 +1,7 @@
 import { StorageGetter, FolderInJSON } from '../../../../lib-client/3nstorage/xsp-fs/common';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { MsgOnDisk } from '../msg-on-disk';
+import { LogError } from '../../../../lib-client/logging/log-to-file';
 declare type ReadonlyFS = web3n.files.ReadonlyFS;
-export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInJSON, storages: StorageGetter, cryptor: AsyncSBoxCryptor): ReadonlyFS;
+export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInJSON, storages: StorageGetter, cryptor: AsyncSBoxCryptor, logError: LogError): ReadonlyFS;
 export {};

package/build/core/asmail/inbox/attachments/fs.js

@@ -20,10 +20,11 @@ exports.fsForAttachments = void 0;
 const common_1 = require("../../../../lib-client/3nstorage/xsp-fs/common");
 const fs_1 = require("../../../../lib-client/3nstorage/xsp-fs/fs");
 class AttachmentStore {
-    constructor(msg, getStorages, cryptor) {
+    constructor(msg, getStorages, cryptor, logError) {
         this.msg = msg;
         this.getStorages = getStorages;
         this.cryptor = cryptor;
+        this.logError = logError;
         this.type = 'asmail-msg';
         this.versioned = false;
         this.nodes = new common_1.NodesContainer();
@@ -66,8 +67,8 @@ class AttachmentStore {
 }
 Object.freeze(AttachmentStore.prototype);
 Object.freeze(AttachmentStore);
-function fsForAttachments(msg, rootJson, storages, cryptor) {
-    const storage = new AttachmentStore(msg, storages, cryptor);
+function fsForAttachments(msg, rootJson, storages, cryptor, logError) {
+    const storage = new AttachmentStore(msg, storages, cryptor, logError);
     const fs = fs_1.XspFS.fromASMailMsgRootFromJSON(storage, rootJson, 'attachments');
     return fs;
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020 3NSoft Inc.
+ Copyright (C) 2015 - 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
@@ -297,7 +297,7 @@ class InboxOnServer {
         }
         const attachments = msg.attachmentsJSON;
         if (attachments) {
-            m.attachments = (0, fs_1.fsForAttachments)(msgOnDisk, attachments, this.storages, this.cryptor);
+            m.attachments = (0, fs_1.fsForAttachments)(msgOnDisk, attachments, this.storages, this.cryptor, this.logError);
         }
         return m;
     }

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

@@ -10,6 +10,7 @@ declare type Service = web3n.asmail.Service;
 export declare type MailCAPMaker = () => Service;
 export declare class ASMail {
     private readonly cryptor;
+    private readonly makeNet;
     private readonly inboxPathForUser;
     private readonly logger;
     private keyring;
@@ -18,7 +19,6 @@ export declare class ASMail {
     private delivery;
     private config;
     private sendingParams;
-    private readonly makeNet;
     constructor(cryptor: AsyncSBoxCryptor, makeNet: MakeNet, inboxPathForUser: InboxPathForUser, logger: Logger);
     init(address: string, getSigner: GetSigner, syncedFS: WritableFS, localFS: WritableFS, getStorages: StorageGetter, makeResolver: ServiceLocatorMaker): Promise<void>;
     private setupConfig;

package/build/core/asmail/index.js

@@ -32,6 +32,7 @@ const SEND_PARAMS_DATA_FOLDER = 'sending-params';
 class ASMail {
     constructor(cryptor, makeNet, inboxPathForUser, logger) {
         this.cryptor = cryptor;
+        this.makeNet = makeNet;
         this.inboxPathForUser = inboxPathForUser;
         this.logger = logger;
         this.keyring = undefined;
@@ -40,7 +41,6 @@ class ASMail {
         this.delivery = undefined;
         this.config = undefined;
         this.sendingParams = undefined;
-        this.makeNet = () => makeNet();
         Object.seal(this);
     }
     async init(address, getSigner, syncedFS, localFS, getStorages, makeResolver) {
@@ -70,7 +70,7 @@ class ASMail {
     }
     async setupKeyring(syncedFS) {
         const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, KEYRING_DATA_FOLDER);
-        this.keyring = await keyring_1.KeyRing.makeAndStart(this.cryptor, fs, this.config.publishedKeys);
+        this.keyring = await (0, keyring_1.makeAndKeyRing)(this.cryptor, fs, this.config.publishedKeys);
     }
     async setupSendingParams(syncedFS) {
         const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, SEND_PARAMS_DATA_FOLDER);

package/build/core/asmail/keyring/correspondent-keys.d.ts

@@ -4,7 +4,7 @@
 import { JWKeyPair, MsgKeyRole, ASMailKeyPair } from './common';
 import { JsonKey, JsonKeyShort } from '../../../lib-common/jwkeys';
 import { SuggestedNextKeyPair } from '../msg/opener';
-import { KeyRing } from './index';
+import { KeyPairsStorage } from './index';
 import { Decryptor } from '../../../lib-common/async-cryptor-wrap';
 import { AsyncSBoxCryptor } from 'xsp-files';
 export interface ReceptionPair {
@@ -89,7 +89,7 @@ export declare class CorrespondentKeys {
      * @param serialData from which this object should be reconstructed.
      * Either serialData, or an address should be defined, not both.
      */
-    constructor(keyring: KeyRing, address: string | undefined, serialData?: string);
+    constructor(keyring: KeyPairsStorage, address: string | undefined, serialData?: string);
     /**
      * This attaches all keys into ring's maps.
      * Theis method should be called only once, and only on a deserialized

package/build/core/asmail/keyring/correspondent-keys.js

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