core-3nweb-client-lib 0.30.2 → 0.30.4

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016, 2020, 2022 3NSoft Inc.
+ Copyright (C) 2016, 2020, 2022, 2024 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
@@ -217,18 +217,21 @@ declare namespace web3n.asmail {
 		 * from event source, or if next throws something, although it must
 		 * handle its own stuff.
 		 */
-		subscribe(event: 'message', observer: Observer<IncomingMessage>):
+		subscribe(event: InboxEventType, observer: Observer<IncomingMessage>):
 			() => void;
 		
 	}
 
+	type InboxEventType = 'message';
+
 	interface MsgStruct {
 		/**
 		 * Message type can be
-		 * (a) "mail" for messages that better be viewed in mail styly UI,
-		 * (b) "chat" for messages that better be viewed in chat style UI,
-		 * (c) "app:<app-domain>" for application messages, for example, messages
-		 * for app with domain app.com should have type "app:app.com".
+		 * - "mail" for messages that better be viewed in mail styly UI,
+		 * - "chat" for messages that better be viewed in chat style UI,
+		 * - "app:<app-domain>" for application messages, for example, messages
+		 *   with type "app:app.example.com" is for app.example.com app,
+		 * - "webrtc-signaling" for WebRTC off band signalling.
 		 */
 		msgType: string;
 		subject?: string;

package/build/core/app-files.d.ts

@@ -5,7 +5,7 @@ export declare function appDirs(appDir: string): Readonly<{
     inboxPathFor(user: string): string;
     getUsersOnDisk(): Promise<string[]>;
 }>;
-export declare type AppDirs = ReturnType<typeof appDirs>;
-export declare type GetUsersOnDisk = AppDirs['getUsersOnDisk'];
-export declare type StoragePathForUser = AppDirs['storagePathFor'];
-export declare type InboxPathForUser = AppDirs['inboxPathFor'];
+export type AppDirs = ReturnType<typeof appDirs>;
+export type GetUsersOnDisk = AppDirs['getUsersOnDisk'];
+export type StoragePathForUser = AppDirs['storagePathFor'];
+export type InboxPathForUser = AppDirs['inboxPathFor'];

package/build/core/app-files.js

@@ -16,7 +16,8 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appDirs = exports.UTIL_DIR = void 0;
+exports.UTIL_DIR = void 0;
+exports.appDirs = appDirs;
 const device_fs_1 = require("../lib-client/local-files/device-fs");
 const async_fs_node_1 = require("../lib-common/async-fs-node");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
@@ -79,5 +80,4 @@ function appDirs(appDir) {
         },
     });
 }
-exports.appDirs = appDirs;
 Object.freeze(exports);

package/build/core/asmail/asmail-cap-ipc.d.ts

@@ -1,5 +1,5 @@
 import { ExposedObj, Caller, ExposedServices } from '../../ipc-via-protobuf/connector';
-declare type ASMailService = web3n.asmail.Service;
+type ASMailService = web3n.asmail.Service;
 export declare function exposeASMailCAP(cap: ASMailService, expServices: ExposedServices): ExposedObj<ASMailService>;
 export declare function makeASMailCaller(caller: Caller, objPath: string[]): ASMailService;
 export {};

package/build/core/asmail/asmail-cap-ipc.js

@@ -16,7 +16,8 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeASMailCaller = exports.exposeASMailCAP = void 0;
+exports.exposeASMailCAP = exposeASMailCAP;
+exports.makeASMailCaller = makeASMailCaller;
 const protobuf_msg_1 = require("../../ipc-via-protobuf/protobuf-msg");
 const protobuf_type_1 = require("../../lib-client/protobuf-type");
 const asmail_proto_1 = require("../../protos/asmail.proto");
@@ -47,7 +48,6 @@ function exposeASMailCAP(cap, expServices) {
         },
     };
 }
-exports.exposeASMailCAP = exposeASMailCAP;
 function makeASMailCaller(caller, objPath) {
     const delivPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'delivery');
     const inboxPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'inbox');
@@ -70,7 +70,6 @@ function makeASMailCaller(caller, objPath) {
         },
     };
 }
-exports.makeASMailCaller = makeASMailCaller;
 var getUserId;
 (function (getUserId) {
     function wrapService(fn) {

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

@@ -1,7 +1,7 @@
 import { MailConfigurator } from '../../../lib-client/asmail/service-config';
 import { JsonFileProc } from '../../../lib-client/3nstorage/util/file-based-json';
-declare type WritableFile = web3n.files.WritableFile;
-declare type FileEvent = web3n.files.FileEvent;
+type WritableFile = web3n.files.WritableFile;
+type FileEvent = web3n.files.FileEvent;
 export declare abstract class ParamOnFileAndServer<TF, TS> extends JsonFileProc<TF> {
     private paramPath;
     private serviceConf;

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

@@ -3,7 +3,7 @@ import { GetSigner } from '../../id-manager';
 import { MsgKeyRole } from '../keyring';
 import { JWKeyPair } from '../keyring/common';
 import { NetClient } from '../../../lib-client/request-utils';
-declare type WritableFS = web3n.files.WritableFS;
+type WritableFS = web3n.files.WritableFS;
 /**
  * Instance of this class updates and checks setting of ASMail server.
  */

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

@@ -1,5 +1,5 @@
 import { MailConfigurator } from '../../../lib-client/asmail/service-config';
-declare type WritableFile = web3n.files.WritableFile;
+type WritableFile = web3n.files.WritableFile;
 export interface Invites {
     getAll: () => Map<string, {
         invite: string;

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

@@ -15,7 +15,7 @@
  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.makeInvites = void 0;
+exports.makeInvites = makeInvites;
 const random = require("../../../lib-common/random-node");
 const api = require("../../../lib-common/service-api/asmail/config");
 const common_1 = require("./common");
@@ -29,7 +29,6 @@ function makeInvites(serviceConf) {
         start: invites.start.bind(invites)
     };
 }
-exports.makeInvites = makeInvites;
 class InvitesData extends common_1.ParamOnFileAndServer {
     constructor(serviceConf) {
         super(api.p.anonSenderInvites.URL_END, serviceConf);

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

@@ -2,8 +2,8 @@ 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, MsgKeyRole } from '../keyring/common';
-declare type WritableFile = web3n.files.WritableFile;
-export declare type Certs = api.p.initPubKey.Certs;
+type WritableFile = web3n.files.WritableFile;
+export type Certs = api.p.initPubKey.Certs;
 export interface PublishedIntroKey {
     update: () => Promise<void>;
     find: (kid: string) => {

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

@@ -15,7 +15,7 @@
  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.makePublishedIntroKey = void 0;
+exports.makePublishedIntroKey = makePublishedIntroKey;
 const api = require("../../../lib-common/service-api/asmail/config");
 const common_1 = require("../keyring/common");
 const common_2 = require("./common");
@@ -28,7 +28,6 @@ function makePublishedIntroKey(getSigner, serviceConf) {
         start: published.start.bind(published)
     };
 }
-exports.makePublishedIntroKey = makePublishedIntroKey;
 class PublishedKey extends common_2.ParamOnFileAndServer {
     constructor(getSigner, serviceConf) {
         super(api.p.initPubKey.URL_END, serviceConf);

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

@@ -7,12 +7,12 @@ import { ASMailKeyPair } from '../keyring/common';
 import { NetClient } from '../../../lib-client/request-utils';
 import { LogWarning, LogError } from '../../../lib-client/logging/log-to-file';
 import { ServiceLocator } from '../../../lib-client/service-locator';
-declare type OutgoingMessage = web3n.asmail.OutgoingMessage;
-declare type DeliveryProgress = web3n.asmail.DeliveryProgress;
-declare type DeliveryOptions = web3n.asmail.DeliveryOptions;
-declare type AttachmentsContainer = web3n.asmail.AttachmentsContainer;
-declare type FS = web3n.files.FS;
-declare type WritableFS = web3n.files.WritableFS;
+type OutgoingMessage = web3n.asmail.OutgoingMessage;
+type DeliveryProgress = web3n.asmail.DeliveryProgress;
+type DeliveryOptions = web3n.asmail.DeliveryOptions;
+type AttachmentsContainer = web3n.asmail.AttachmentsContainer;
+type FS = web3n.files.FS;
+type WritableFS = web3n.files.WritableFS;
 export declare class Attachments {
     container: AttachmentsContainer | undefined;
     fs: FS | undefined;

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

@@ -15,7 +15,9 @@
  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.addToNumberLineSegments = exports.estimatePackedSizeOf = exports.SEG_SIZE_IN_K_QUATS = exports.Attachments = void 0;
+exports.SEG_SIZE_IN_K_QUATS = exports.Attachments = void 0;
+exports.estimatePackedSizeOf = estimatePackedSizeOf;
+exports.addToNumberLineSegments = addToNumberLineSegments;
 const attachments_container_1 = require("../msg/attachments-container");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const ATTACHMENTS_NAME = 'attachments';
@@ -136,7 +138,6 @@ function estimatePackedSizeOf(size) {
     }
     return 148 + numOfCompleteSegs * exports.SEG_SIZE_IN_K_QUATS * 256 + lastSegSize;
 }
-exports.estimatePackedSizeOf = estimatePackedSizeOf;
 /**
  * This is a utility function that adds a number into given number line
  * segments. Each segment is represented by an array, in which 0-th element is
@@ -182,5 +183,4 @@ function addToNumberLineSegments(segments, n) {
     }
     segments.unshift([n, n]);
 }
-exports.addToNumberLineSegments = addToNumberLineSegments;
 Object.freeze(exports);

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

@@ -1,8 +1,8 @@
 import { ResourcesForSending } from './common';
-declare type WritableFS = web3n.files.WritableFS;
-declare type DeliveryService = web3n.asmail.DeliveryService;
-declare type DeliveryProgress = web3n.asmail.DeliveryProgress;
-declare type Observer<T> = web3n.Observer<T>;
+type WritableFS = web3n.files.WritableFS;
+type DeliveryService = web3n.asmail.DeliveryService;
+type DeliveryProgress = web3n.asmail.DeliveryProgress;
+type Observer<T> = web3n.Observer<T>;
 export declare class Delivery {
     private readonly fs;
     private readonly r;

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

@@ -2,10 +2,10 @@ import { MsgPacker, PackJSON } from '../msg/packer';
 import { ResourcesForSending, Attachments } from './common';
 import { WIPstate } from './per-recipient-wip';
 import { Observable } from 'rxjs';
-declare type WritableFS = web3n.files.WritableFS;
-declare type DeliveryProgress = web3n.asmail.DeliveryProgress;
-declare type OutgoingMessage = web3n.asmail.OutgoingMessage;
-declare type DeliveryOptions = web3n.asmail.DeliveryOptions;
+type WritableFS = web3n.files.WritableFS;
+type DeliveryProgress = web3n.asmail.DeliveryProgress;
+type OutgoingMessage = web3n.asmail.OutgoingMessage;
+type DeliveryOptions = web3n.asmail.DeliveryOptions;
 export declare class Msg {
     readonly id: string;
     readonly r: ResourcesForSending;

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

@@ -55,6 +55,9 @@ async function estimatedPackedSize(msgToSend, attachments) {
     return totalSize;
 }
 class Msg {
+    get progress$() {
+        return this.progressPublisher.asObservable();
+    }
     constructor(id, r, progress, msgFS) {
         this.id = id;
         this.r = r;
@@ -74,9 +77,6 @@ class Msg {
         this.progressPublisher = new rxjs_1.Subject();
         Object.seal(this);
     }
-    get progress$() {
-        return this.progressPublisher.asObservable();
-    }
     static async forNew(id, msgFS, msgToSend, sender, recipients, r, attachments, localMeta, retryOpts) {
         const progress = {
             msgSize: await estimatedPackedSize(msgToSend, attachments),

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

@@ -2,6 +2,6 @@ import { StorageGetter, FolderInJSON } from '../../../../lib-client/3nstorage/xs
 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;
+type ReadonlyFS = web3n.files.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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fsForAttachments = void 0;
+exports.fsForAttachments = fsForAttachments;
 const common_1 = require("../../../../lib-client/3nstorage/xsp-fs/common");
 const fs_1 = require("../../../../lib-client/3nstorage/xsp-fs/fs");
 class AttachmentStore {
@@ -72,5 +72,4 @@ function fsForAttachments(msg, rootJson, storages, cryptor, logError) {
     const fs = fs_1.XspFS.fromASMailMsgRootFromJSON(storage, rootJson, 'attachments');
     return fs;
 }
-exports.fsForAttachments = fsForAttachments;
 Object.freeze(exports);

package/build/core/asmail/inbox/inbox-events.d.ts

@@ -1,7 +1,8 @@
 import { MailRecipient } from '../../../lib-client/asmail/recipient';
 import { LogError } from '../../../lib-client/logging/log-to-file';
-declare type IncomingMessage = web3n.asmail.IncomingMessage;
-declare type Observer<T> = web3n.Observer<T>;
+type IncomingMessage = web3n.asmail.IncomingMessage;
+type InboxEventType = web3n.asmail.InboxEventType;
+type Observer<T> = web3n.Observer<T>;
 /**
  * Instance of this class handles event subscription from UI side. It observes
  * inbox server events, handles them, and generates respective events for UI
@@ -10,6 +11,6 @@ declare type Observer<T> = web3n.Observer<T>;
 export declare class InboxEvents {
     constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, logError: LogError);
     private newMsg$;
-    subscribe<T>(event: string, observer: Observer<T>): () => void;
+    subscribe<T>(event: InboxEventType, observer: Observer<T>): () => void;
 }
 export {};

package/build/core/asmail/inbox/inbox-events.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019, 2022 3NSoft Inc.
+ Copyright (C) 2017, 2019, 2022, 2024 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/asmail/inbox/index.d.ts

@@ -10,8 +10,8 @@ import { LogError } from '../../../lib-client/logging/log-to-file';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { SendingParams } from '../msg/common';
 import { NetClient } from '../../../lib-client/request-utils';
-declare type WritableFS = web3n.files.WritableFS;
-declare type InboxService = web3n.asmail.InboxService;
+type WritableFS = web3n.files.WritableFS;
+type InboxService = web3n.asmail.InboxService;
 export interface ResourcesForReceiving {
     address: string;
     getSigner: GetSigner;

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

@@ -165,8 +165,10 @@ class InboxOnServer {
             return true;
         }
         catch (exc) {
-            await msgOnDisk.updateMsgKeyStatus('fail');
             await this.logError(exc, `Problem with opening message ${msgId}`);
+            if (msgOnDisk.keyStatus !== 'ok') {
+                await msgOnDisk.updateMsgKeyStatus('fail');
+            }
             return false;
         }
     }
@@ -187,8 +189,8 @@ class InboxOnServer {
     checkServerAuthIfPresent(meta, decrInfo) {
         // if sender authenticated to server, check that it matches address,
         // recovered from message decryption 
-        if (meta.authSender &&
-            !(0, canonical_address_1.areAddressesEqual)(meta.authSender, decrInfo.correspondent)) {
+        if (meta.authSender
+            && !(0, canonical_address_1.areAddressesEqual)(meta.authSender, decrInfo.correspondent)) {
             throw new Error(`Sender authenticated to server as ${meta.authSender}, while decrypting key is associated with ${decrInfo.correspondent}`);
         }
     }
@@ -227,7 +229,8 @@ class InboxOnServer {
             if (msgIds.length === 0) {
                 return indexedMsgs;
             }
-            const keying = msgIds.map(msgId => this.startCachingAndAddKeyToIndex(msgId).catch(async (exc) => {
+            const keying = msgIds.map(msgId => this.startCachingAndAddKeyToIndex(msgId)
+                .catch(async (exc) => {
                 await this.logError(exc, `Failed to start caching message ${msgId}`);
             }));
             await Promise.all(keying);

package/build/core/asmail/inbox/msg-indexing/index.d.ts

@@ -1,6 +1,6 @@
 import { MsgKeyInfo, MsgKeyRole } from '../../keyring';
-declare type WritableFS = web3n.files.WritableFS;
-declare type MsgInfo = web3n.asmail.MsgInfo;
+type WritableFS = web3n.files.WritableFS;
+type MsgInfo = web3n.asmail.MsgInfo;
 /**
  * This message index stores info for messages present on the server, in the
  * inbox. Records contain message key info, time of delivery, and time of

package/build/core/asmail/inbox/msg-indexing/logs-n-entries.d.ts

@@ -1,6 +1,6 @@
 import { MsgKeyInfo, MsgKeyRole } from '../../keyring';
-declare type WritableFS = web3n.files.WritableFS;
-declare type MsgInfo = web3n.asmail.MsgInfo;
+type WritableFS = web3n.files.WritableFS;
+type MsgInfo = web3n.asmail.MsgInfo;
 interface MsgOpenedLog {
     msgState: 'opened';
     msgId: string;
@@ -16,7 +16,7 @@ interface MsgRemovedLog {
     msgId: string;
     deliveryTS: number;
 }
-declare type MsgLog = MsgOpenedLog | MsgRemovedLog;
+type MsgLog = MsgOpenedLog | MsgRemovedLog;
 export interface MsgKey {
     msgKey: Uint8Array;
     msgKeyRole: MsgKeyRole;

package/build/core/asmail/inbox/msg-indexing/logs-n-entries.js

@@ -16,7 +16,8 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MsgLogs = exports.makeJsonBasedIndexedRecords = void 0;
+exports.MsgLogs = void 0;
+exports.makeJsonBasedIndexedRecords = makeJsonBasedIndexedRecords;
 const synced_1 = require("../../../../lib-common/processes/synced");
 const buffer_utils_1 = require("../../../../lib-common/buffer-utils");
 const timed_cache_1 = require("../../../../lib-common/timed-cache");
@@ -68,7 +69,6 @@ function notFoundOrReThrow(exc) {
 function makeJsonBasedIndexedRecords(logs) {
     return new JsonBasedIndexedRecords(logs);
 }
-exports.makeJsonBasedIndexedRecords = makeJsonBasedIndexedRecords;
 function toMsgOpenedLog(msgInfo, decrInfo, removeAfter) {
     if (!decrInfo.key) {
         throw new Error(`Given message decryption info doesn't have a key for message ${msgInfo.msgId}`);

package/build/core/asmail/inbox/msg-indexing/sql-indexing.d.ts

@@ -1,4 +1,4 @@
 import { IndexedRecords } from './logs-n-entries';
-declare type WritableFS = web3n.files.WritableFS;
+type WritableFS = web3n.files.WritableFS;
 export declare function makeSqliteBasedIndexedRecords(syncedFS: WritableFS): Promise<IndexedRecords>;
 export {};

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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSqliteBasedIndexedRecords = void 0;
+exports.makeSqliteBasedIndexedRecords = makeSqliteBasedIndexedRecords;
 const timed_cache_1 = require("../../../../lib-common/timed-cache");
 const lib_sqlite_on_3nstorage_1 = require("../../../../lib-sqlite-on-3nstorage");
 const file_1 = require("../../../../lib-common/exceptions/file");
@@ -316,5 +316,4 @@ Object.freeze(SqliteBasedIndexedRecords);
 function makeSqliteBasedIndexedRecords(syncedFS) {
     return SqliteBasedIndexedRecords.makeAndStart(syncedFS);
 }
-exports.makeSqliteBasedIndexedRecords = makeSqliteBasedIndexedRecords;
 Object.freeze(exports);

package/build/core/asmail/inbox/msg-on-disk.d.ts

@@ -2,7 +2,7 @@ import { ObjOnDisk } from '../../../lib-client/objs-on-disk/obj-on-disk';
 import { MsgMeta } from '../../../lib-common/service-api/asmail/retrieval';
 import { ObjSource } from 'xsp-files';
 import { MsgDownloader } from './msg-downloader';
-export declare type MsgKeyStatus = 'not-checked' | 'not-found' | 'fail' | 'ok';
+export type MsgKeyStatus = 'not-checked' | 'not-found' | 'fail' | 'ok';
 export interface ObjSize {
     header: number;
     segments: number;
@@ -32,6 +32,6 @@ export declare class MsgOnDisk {
     getMsgObj(objId: string): Promise<ObjSource>;
     get deliveryTS(): number;
     get keyStatus(): MsgKeyStatus;
-    updateMsgKeyStatus(newStatus: MsgKeyStatus): Promise<void>;
+    updateMsgKeyStatus(newStatus: Exclude<MsgKeyStatus, 'not-checked'>): Promise<void>;
     private saveStatusToDisk;
 }

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

@@ -100,12 +100,12 @@ class MsgOnDisk {
     }
     updateMsgKeyStatus(newStatus) {
         return this.syncProc.startOrChain(async () => {
-            if (newStatus === 'not-checked') {
-                throw new Error(`New key status cannot be ${newStatus}.`);
-            }
             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}`);
             }

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

@@ -5,9 +5,9 @@ import { AsyncSBoxCryptor } from 'xsp-files';
 import { Logger } from '../../lib-client/logging/log-to-file';
 import { ServiceLocatorMaker } from '../../lib-client/service-locator';
 import { MakeNet } from '..';
-declare type WritableFS = web3n.files.WritableFS;
-declare type Service = web3n.asmail.Service;
-export declare type MailCAPMaker = () => Service;
+type WritableFS = web3n.files.WritableFS;
+type Service = web3n.asmail.Service;
+export type MailCAPMaker = () => Service;
 export declare class ASMail {
     private readonly cryptor;
     private readonly makeNet;

package/build/core/asmail/key-verification.js

@@ -15,7 +15,8 @@
  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.checkAndExtractPKeyWithAddress = exports.checkAndExtractPKey = void 0;
+exports.checkAndExtractPKey = checkAndExtractPKey;
+exports.checkAndExtractPKeyWithAddress = checkAndExtractPKeyWithAddress;
 const canonical_address_1 = require("../../lib-common/canonical-address");
 const mid_sigs_NaCl_Ed_1 = require("../../lib-common/mid-sigs-NaCl-Ed");
 const jwkeys_1 = require("../../lib-common/jwkeys");
@@ -40,7 +41,6 @@ async function checkAndExtractPKey(client, resolver, address, certs) {
     const pkey = mid_sigs_NaCl_Ed_1.relyingParty.verifyPubKey(certs.pkeyCert, address, { user: certs.userCert, prov: certs.provCert, root: rootCert }, rootAddr, validAt);
     return pkey;
 }
-exports.checkAndExtractPKey = checkAndExtractPKey;
 /**
  * This returns a promise, resolvable to public key and related address, when
  * certificates' verification is successful, and rejectable in all other cases.
@@ -69,5 +69,4 @@ async function checkAndExtractPKeyWithAddress(client, resolver, certs, validAt)
     const pkey = mid_sigs_NaCl_Ed_1.relyingParty.verifyPubKey(certs.pkeyCert, address, { user: certs.userCert, prov: certs.provCert, root: rootCert }, rootAddr, validAt);
     return { address, pkey };
 }
-exports.checkAndExtractPKeyWithAddress = checkAndExtractPKeyWithAddress;
 Object.freeze(exports);

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

@@ -1,5 +1,5 @@
 import { JsonKey, JsonKeyShort } from '../../../lib-common/jwkeys';
-export declare type MsgKeyRole = 'suggested' | 'in_use' | 'old' | 'published_intro' | 'prev_published_intro' | 'introductory';
+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 interface JWKeyPair {

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

@@ -16,7 +16,13 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.msgKeyPackSizeFor = exports.extractKeyBytes = exports.extractPKeyBytes = exports.extractSKeyBytes = exports.generateSymmetricKey = exports.generateKeyPair = exports.KEY_USE = exports.PID_LENGTH = exports.KID_LENGTH = void 0;
+exports.KEY_USE = exports.PID_LENGTH = exports.KID_LENGTH = void 0;
+exports.generateKeyPair = generateKeyPair;
+exports.generateSymmetricKey = generateSymmetricKey;
+exports.extractSKeyBytes = extractSKeyBytes;
+exports.extractPKeyBytes = extractPKeyBytes;
+exports.extractKeyBytes = extractKeyBytes;
+exports.msgKeyPackSizeFor = msgKeyPackSizeFor;
 /**
  * This file contains common functions used by parts of a keyring.
  */
@@ -55,7 +61,6 @@ async function generateKeyPair() {
     };
     return { skey: skey, pkey: pkey };
 }
-exports.generateKeyPair = generateKeyPair;
 ;
 /**
  * We have this function for future use by a keyring, that takes symmetric key.
@@ -72,7 +77,6 @@ async function generateSymmetricKey() {
         kid: await (0, random_node_1.stringOfB64Chars)(exports.KID_LENGTH)
     };
 }
-exports.generateSymmetricKey = generateSymmetricKey;
 ;
 function getKeyBytesFrom(key, use, alg, klen) {
     if (key.use === use) {
@@ -98,7 +102,6 @@ function getKeyBytesFrom(key, use, alg, klen) {
 function extractSKeyBytes(key) {
     return getKeyBytesFrom(key, exports.KEY_USE.SECRET, ecma_nacl_1.box.JWK_ALG_NAME, ecma_nacl_1.box.KEY_LENGTH);
 }
-exports.extractSKeyBytes = extractSKeyBytes;
 /**
  * This returns bytes of from a given public key's JWK form
  * @param key is a JWK form of a key
@@ -106,7 +109,6 @@ exports.extractSKeyBytes = extractSKeyBytes;
 function extractPKeyBytes(key) {
     return getKeyBytesFrom(key, exports.KEY_USE.PUBLIC, ecma_nacl_1.box.JWK_ALG_NAME, ecma_nacl_1.box.KEY_LENGTH);
 }
-exports.extractPKeyBytes = extractPKeyBytes;
 /**
  * This returns bytes of a given public key's short JWK form
  * @param key is a short JWK form of a key
@@ -118,7 +120,6 @@ function extractKeyBytes(key) {
     }
     return bytes;
 }
-exports.extractKeyBytes = extractKeyBytes;
 /**
  * This returns a length of a message key pack, used with a given public key
  * crypt-algorithms assembly.
@@ -132,5 +133,4 @@ function msgKeyPackSizeFor(alg) {
         throw new Error(`Encryption algorithm ${alg} is not known.`);
     }
 }
-exports.msgKeyPackSizeFor = msgKeyPackSizeFor;
 Object.freeze(exports);

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

@@ -76,7 +76,7 @@ export interface RatchetedSendingPair extends BaseSendingPair {
         lastTS: number;
     };
 }
-export declare type SendingPair = IntroductorySendingPair | RatchetedSendingPair;
+export type SendingPair = IntroductorySendingPair | RatchetedSendingPair;
 export declare function msgMasterDecryptor(cryptor: AsyncSBoxCryptor, skey: JsonKey, pkey: JsonKeyShort): Decryptor;
 export declare class CorrespondentKeys {
     private keyring;

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

@@ -16,7 +16,8 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CorrespondentKeys = exports.msgMasterDecryptor = void 0;
+exports.CorrespondentKeys = void 0;
+exports.msgMasterDecryptor = msgMasterDecryptor;
 /**
  * This file contains functionality, used inside keyring.
  */
@@ -41,7 +42,6 @@ function msgMasterDecryptor(cryptor, skey, pkey) {
     msgMasterKey.fill(0);
     return masterDecr;
 }
-exports.msgMasterDecryptor = msgMasterDecryptor;
 function calcMsgMasterKey(skey, pkey) {
     if (skey.alg === ecma_nacl_1.box.JWK_ALG_NAME) {
         const sk = (0, common_1.extractSKeyBytes)(skey);
@@ -58,6 +58,9 @@ function calcMsgMasterKeyB64(skey, pkey) {
 }
 const MIN_PERIOD_FOR_PAIR = 15 * 60 * 1000;
 class CorrespondentKeys {
+    get correspondent() {
+        return this.keys.correspondent;
+    }
     /**
      * @param keyring in which these keys are hanging.
      * @param address of this correspondent.
@@ -86,9 +89,6 @@ class CorrespondentKeys {
         }
         Object.seal(this);
     }
-    get correspondent() {
-        return this.keys.correspondent;
-    }
     /**
      * This attaches all keys into ring's maps.
      * Theis method should be called only once, and only on a deserialized