core-3nweb-client-lib 0.25.6 → 0.27.0

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

@@ -26,7 +26,7 @@ class Attachments {
         Object.freeze(this);
     }
     static fromMsg(msg) {
-        if (!attachments_container_1.isContainerEmpty(msg.attachments)) {
+        if (!(0, attachments_container_1.isContainerEmpty)(msg.attachments)) {
             return new Attachments(msg.attachments, undefined);
         }
         return;
@@ -42,11 +42,11 @@ class Attachments {
                 const link = await msgFS.readLink(`${ATTACHMENTS_NAME}/${f.name}`);
                 if (link.isFile) {
                     const file = (await link.target());
-                    attachments_container_1.addFileTo(container, file, f.name);
+                    (0, attachments_container_1.addFileTo)(container, file, f.name);
                 }
                 else if (link.isFolder) {
                     const fs = (await link.target());
-                    attachments_container_1.addFolderTo(container, fs, f.name);
+                    (0, attachments_container_1.addFolderTo)(container, fs, f.name);
                 }
             }
             return new Attachments(container, undefined);
@@ -63,10 +63,10 @@ class Attachments {
     async linkIn(msgFS) {
         if (this.container) {
             await msgFS.makeFolder(ATTACHMENTS_NAME);
-            for (const f of attachments_container_1.iterFilesIn(this.container)) {
+            for (const f of (0, attachments_container_1.iterFilesIn)(this.container)) {
                 msgFS.link(`${ATTACHMENTS_NAME}/${f.fileName}`, f.file);
             }
-            for (const f of attachments_container_1.iterFoldersIn(this.container)) {
+            for (const f of (0, attachments_container_1.iterFoldersIn)(this.container)) {
                 msgFS.link(`${ATTACHMENTS_NAME}/${f.folderName}`, f.folder);
             }
         }
@@ -85,13 +85,13 @@ class Attachments {
     async estimatedPackedSize() {
         if (this.container) {
             let totalSize = 0;
-            for (const f of attachments_container_1.iterFilesIn(this.container)) {
+            for (const f of (0, attachments_container_1.iterFilesIn)(this.container)) {
                 const fileSize = (await f.file.stat()).size;
                 if (typeof fileSize === 'number') {
                     totalSize += await estimatePackedSizeOf(fileSize);
                 }
             }
-            for (const f of attachments_container_1.iterFoldersIn(this.container)) {
+            for (const f of (0, attachments_container_1.iterFoldersIn)(this.container)) {
                 totalSize += await estimatePackedSizeOfFolder(f.folder);
             }
             return totalSize;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017, 2020 - 2021 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 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
@@ -24,6 +24,7 @@ const common_1 = require("./common");
 const json_utils_1 = require("../../../lib-common/json-utils");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const SMALL_MSG_SIZE = 1024 * 1024;
 const MSGS_FOLDER = 'msgs';
 function idToMsgFolder(id) {
@@ -50,8 +51,8 @@ class Delivery {
          */
         this.queuedDelivery = [];
         this.allDeliveries = new rxjs_1.Subject();
-        this.allDeliveries$ = this.allDeliveries.asObservable().pipe(operators_1.share());
-        file_1.ensureCorrectFS(fs, 'local', true);
+        this.allDeliveries$ = this.allDeliveries.asObservable().pipe((0, operators_1.share)());
+        (0, file_1.ensureCorrectFS)(fs, 'local', true);
         this.r.notifyMsgProgress =
             (id, progress) => this.allDeliveries.next({ id, progress });
         Object.freeze(this.r);
@@ -113,18 +114,18 @@ class Delivery {
         }
         if (msg.isDone()) {
             if (observer.next) {
-                observer.next(json_utils_1.copy(msg.progress));
+                observer.next((0, json_utils_1.copy)(msg.progress));
             }
             if (observer.complete) {
                 observer.complete();
             }
             return () => { };
         }
-        const subToProgress = msg.progress$.subscribe(observer);
+        const subToProgress = msg.progress$.subscribe((0, utils_for_observables_1.toRxObserver)(observer));
         return () => { subToProgress.unsubscribe(); };
     }
     observeAllDeliveries(observer) {
-        const subToProgress = this.allDeliveries$.subscribe(observer);
+        const subToProgress = this.allDeliveries$.subscribe((0, utils_for_observables_1.toRxObserver)(observer));
         return () => subToProgress.unsubscribe();
     }
     async preFlight(recipient) {

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

@@ -17,12 +17,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Msg = void 0;
 const packer_1 = require("../msg/packer");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const common_1 = require("./common");
 const per_recipient_wip_1 = require("./per-recipient-wip");
 const rxjs_1 = require("rxjs");
 const json_utils_1 = require("../../../lib-common/json-utils");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 const MAIN_OBJ_FILE_NAME = 'msg.json';
 const PROGRESS_INFO_FILE_NAME = 'progress.json';
 const WIPS_INFO_FILE_NAME = 'wips.json';
@@ -36,7 +37,7 @@ function checkIfAllRecipientsDone(progress) {
     return true;
 }
 async function estimatedPackedSize(msgToSend, attachments) {
-    let totalSize = common_1.estimatePackedSizeOf(buffer_utils_1.utf8.pack(JSON.stringify(msgToSend)).length);
+    let totalSize = (0, common_1.estimatePackedSizeOf)(buffer_utils_1.utf8.pack(JSON.stringify(msgToSend)).length);
     if (attachments) {
         totalSize += await attachments.estimatedPackedSize();
     }
@@ -48,9 +49,9 @@ class Msg {
         this.r = r;
         this.progress = progress;
         this.msgFS = msgFS;
-        this.sendingProc = new processes_1.SingleProc();
+        this.sendingProc = new synced_1.SingleProc();
         this.completionPromise = undefined;
-        this.progressSavingProc = new processes_1.SingleProc();
+        this.progressSavingProc = new synced_1.SingleProc();
         this.cancelled = false;
         this.sender = undefined;
         this.recipients = undefined;
@@ -126,8 +127,8 @@ class Msg {
             this.progress.allDone = true;
             saveProgress = true;
         }
-        this.r.notifyMsgProgress(this.id, json_utils_1.copy(this.progress));
-        this.progressPublisher.next(json_utils_1.copy(this.progress));
+        this.r.notifyMsgProgress(this.id, (0, json_utils_1.copy)(this.progress));
+        this.progressPublisher.next((0, json_utils_1.copy)(this.progress));
         if (saveProgress) {
             this.progressSavingProc.startOrChain(async () => {
                 await this.msgFS.writeJSONFile(PROGRESS_INFO_FILE_NAME, this.progress, {});
@@ -197,7 +198,7 @@ class Msg {
             throw new Error(`Message delivery has already completed.`);
         }
         if (!this.completionPromise) {
-            this.completionPromise = processes_1.defer();
+            this.completionPromise = (0, deferred_1.defer)();
         }
         return this.completionPromise.promise;
     }

package/build/core/asmail/delivery/per-recipient-wip.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WIP = void 0;
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const sender_1 = require("../../../lib-client/asmail/sender");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const key_verification_1 = require("../key-verification");
 const MSG_SIZE_FOR_STATE_RECORDING = 1024 * 1024;
 const EMPTY_BYTE_ARR = new Uint8Array(0);
@@ -34,7 +34,7 @@ class WIP {
         this.msg = msg;
         this.state = state;
         this.cryptor = cryptor;
-        this.proc = new processes_1.SingleProc();
+        this.proc = new synced_1.SingleProc();
         this.sender = undefined;
         this.packer = undefined;
         this.currentObjIndInMeta = 0;
@@ -205,7 +205,7 @@ class WIP {
             return;
         }
         const certs = await this.sender.getRecipientsInitPubKey();
-        return key_verification_1.checkAndExtractPKey(this.sender.net, this.msg.r.midResolver, recipient, certs).catch(err => {
+        return (0, key_verification_1.checkAndExtractPKey)(this.sender.net, this.msg.r.midResolver, recipient, certs).catch(err => {
             const exc = {
                 runtimeException: true,
                 type: 'asmail-delivery',

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

@@ -27,8 +27,15 @@ class AttachmentStore {
         this.type = 'asmail-msg';
         this.versioned = false;
         this.nodes = new common_1.NodesContainer();
+        this.connect = undefined;
         Object.seal(this);
     }
+    getNodeEvents() {
+        throw new Error(`Attachment's storage is readonly.`);
+    }
+    broadcastNodeEvent() {
+        throw new Error(`Attachment's storage is readonly.`);
+    }
     storageForLinking(type, location) {
         if (type === 'share') {
             return this.getStorages('share', location);
@@ -37,10 +44,13 @@ class AttachmentStore {
             throw new Error(`Attachment's storage cannot link to ${type} storage.`);
         }
     }
+    status() {
+        throw new Error(`Attachment's storage is not versioned`);
+    }
     generateNewObjId() {
         throw new Error(`Attachment's storage is readonly.`);
     }
-    getObj(objId) {
+    getObjSrc(objId) {
         if (typeof objId !== 'string') {
             throw new Error(`Attachment's storage uses only string objId's, while given parameter is: ${objId}`);
         }

package/build/core/asmail/inbox/cached-msgs.js

@@ -20,13 +20,13 @@ exports.CachedMessages = void 0;
 const msg_on_disk_1 = require("./msg-on-disk");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 const obj_folders_1 = require("../../../lib-client/objs-on-disk/obj-folders");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 class CachedMessages {
     constructor(folders, downloader) {
         this.folders = folders;
         this.downloader = downloader;
-        this.syncProc = new processes_1.NamedProcs();
-        this.msgFiles = timed_cache_1.makeTimedCache(60 * 1000);
+        this.syncProc = new synced_1.NamedProcs();
+        this.msgFiles = (0, timed_cache_1.makeTimedCache)(60 * 1000);
         Object.freeze(this);
     }
     static async makeFor(path, downloader, logError) {

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019 3NSoft Inc.
+ Copyright (C) 2017, 2019, 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
@@ -19,6 +19,7 @@ exports.InboxEvents = void 0;
 const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
 const server_events_1 = require("../../../lib-client/server-events");
 const operators_1 = require("rxjs/operators");
+const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const SERVER_EVENTS_RESTART_WAIT_SECS = 30;
 /**
  * Instance of this class handles event subscription from UI side. It observes
@@ -29,16 +30,16 @@ class InboxEvents {
     constructor(msgReceiver, getMsg, logError) {
         const serverEvents = new server_events_1.ServerEvents(() => msgReceiver.openEventSource(), SERVER_EVENTS_RESTART_WAIT_SECS);
         this.newMsg$ = serverEvents.observe(retrieval_1.msgRecievedCompletely.EVENT_NAME)
-            .pipe(operators_1.mergeMap(ev => getMsg(ev.msgId)
+            .pipe((0, operators_1.mergeMap)(ev => getMsg(ev.msgId)
             .catch(async (err) => {
             // TODO should more error handling logic be added here?
             await logError(err, `Cannot get message ${ev.msgId}`);
-        })), operators_1.filter(msg => !!msg), operators_1.share());
+        })), (0, operators_1.filter)(msg => !!msg), (0, operators_1.share)());
         Object.seal(this);
     }
     subscribe(event, observer) {
         if (event === 'message') {
-            const subscription = this.newMsg$.subscribe(observer);
+            const subscription = this.newMsg$.subscribe((0, utils_for_observables_1.toRxObserver)(observer));
             return () => subscription.unsubscribe();
         }
         else {

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

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InboxOnServer = void 0;
 const error_1 = require("../../../lib-common/exceptions/error");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const recipient_1 = require("../../../lib-client/asmail/recipient");
 const opener_1 = require("../msg/opener");
 const msg_indexing_1 = require("./msg-indexing");
@@ -48,14 +48,14 @@ class InboxOnServer {
         this.cache = cache;
         this.index = index;
         this.logError = logError;
-        this.procs = new processes_1.NamedProcs();
-        this.recentlyOpenedMsgs = timed_cache_1.makeTimedCache(60 * 1000);
+        this.procs = new synced_1.NamedProcs();
+        this.recentlyOpenedMsgs = (0, timed_cache_1.makeTimedCache)(60 * 1000);
         this.inboxEvents = new inbox_events_1.InboxEvents(this.msgReceiver, this.getMsg.bind(this), this.logError);
         Object.seal(this);
     }
     static async makeAndStart(cachePath, fs, r) {
         try {
-            file_1.ensureCorrectFS(fs, 'synced', true);
+            (0, file_1.ensureCorrectFS)(fs, 'synced', true);
             const msgReceiver = new recipient_1.MailRecipient(r.address, r.getSigner, () => r.asmailResolver(r.address), r.makeNet());
             const downloader = new msg_downloader_1.MsgDownloader(msgReceiver);
             const cache = await cached_msgs_1.CachedMessages.makeFor(cachePath, downloader, r.logError);
@@ -63,7 +63,7 @@ class InboxOnServer {
             return new InboxOnServer(r.correspondents, msgReceiver, r.getStorages, r.cryptor, downloader, cache, index, r.logError);
         }
         catch (err) {
-            throw error_1.errWithCause(err, 'Failed to initialize Inbox');
+            throw (0, error_1.errWithCause)(err, 'Failed to initialize Inbox');
         }
     }
     wrap() {
@@ -122,12 +122,12 @@ class InboxOnServer {
                     mainObjSrc = await msgOnDisk.getMsgObj(mainObjId);
                 }
                 const fKey = buffer_utils_1.base64.open(mainObjFileKey);
-                const openedMsg = await opener_1.openMsg(msgId, mainObjId, mainObjSrc, msgKeyPackLen, fKey, this.cryptor);
+                const openedMsg = await (0, opener_1.openMsg)(msgId, mainObjId, mainObjSrc, msgKeyPackLen, fKey, this.cryptor);
                 fKey.fill(0);
                 return openedMsg;
             };
             const checkMidKeyCerts = (certs) => {
-                return key_verification_1.checkAndExtractPKeyWithAddress(this.msgReceiver.getNet(), this.r.midResolver, certs, Math.round(msgOnDisk.deliveryTS / 1000));
+                return (0, key_verification_1.checkAndExtractPKeyWithAddress)(this.msgReceiver.getNet(), this.r.midResolver, certs, Math.round(msgOnDisk.deliveryTS / 1000));
             };
             const decrOut = await this.r.msgDecryptor(meta.extMeta, getMainObjHeader, getOpenedMsg, checkMidKeyCerts);
             if (decrOut) {
@@ -183,7 +183,7 @@ class InboxOnServer {
         // if sender authenticated to server, check that it matches address,
         // recovered from message decryption 
         if (meta.authSender &&
-            !canonical_address_1.areAddressesEqual(meta.authSender, decrInfo.correspondent)) {
+            !(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}`);
         }
     }
@@ -252,7 +252,7 @@ class InboxOnServer {
                 // 	this.index.remove(msgInfo),
                 // 	this.removeMsgFromServerAndCache(msgId)
                 // ]);
-                throw recipient_1.makeMsgNotFoundException(msgId);
+                throw (0, recipient_1.makeMsgNotFoundException)(msgId);
             }
             else if (msgOnDisk.keyStatus === 'not-checked') {
                 await this.startCachingAndAddKeyToIndex(msgId);
@@ -265,9 +265,9 @@ class InboxOnServer {
             const mainObj = await msgOnDisk.getMsgObj(mainObjId);
             const msgKey = await this.index.fKeyFor({ msgId, deliveryTS: meta.deliveryCompletion });
             if (!msgKey) {
-                throw recipient_1.makeMsgNotFoundException(msgId);
+                throw (0, recipient_1.makeMsgNotFoundException)(msgId);
             }
-            msg = await opener_1.openMsg(msgId, mainObjId, mainObj, msgKey.mainObjHeaderOfs, msgKey.msgKey, this.cryptor);
+            msg = await (0, opener_1.openMsg)(msgId, mainObjId, mainObj, msgKey.mainObjHeaderOfs, msgKey.msgKey, this.cryptor);
             msg.setMsgKeyRole(msgKey.msgKeyRole);
             return this.msgToUIForm(msg, msgOnDisk.deliveryTS, msgOnDisk);
         });
@@ -297,7 +297,7 @@ class InboxOnServer {
         }
         const attachments = msg.attachmentsJSON;
         if (attachments) {
-            m.attachments = fs_1.fsForAttachments(msgOnDisk, attachments, this.storages, this.cryptor);
+            m.attachments = (0, fs_1.fsForAttachments)(msgOnDisk, attachments, this.storages, this.cryptor);
         }
         return m;
     }

package/build/core/asmail/inbox/msg-downloader.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgDownloader = void 0;
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const MAX_GETTING_CHUNK = 512 * 1024;
 const DOWNLOAD_START_CHUNK = 128 * 1024;
@@ -32,7 +32,7 @@ class MsgDownloader {
          * When it comes to the download start, if chain exists, it means that
          * process has already started.
          */
-        this.downloadProcs = new processes_1.NamedProcs();
+        this.downloadProcs = new synced_1.NamedProcs();
         Object.freeze(this);
     }
     async sync(msgId, objId, action) {
@@ -76,7 +76,7 @@ class MsgDownloader {
                     chunks.push(chunk);
                     ofs += chunk.length;
                 }
-                return buffer_utils_1.joinByteArrs(chunks);
+                return (0, buffer_utils_1.joinByteArrs)(chunks);
             }
         });
     }

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

@@ -17,7 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgIndex = void 0;
-const processes_1 = require("../../../lib-common/processes");
+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");
 const LIMIT_RECORDS_PER_FILE = 200;
@@ -97,9 +97,9 @@ class MsgIndex {
     constructor(files) {
         this.files = files;
         this.latest = undefined;
-        this.cached = timed_cache_1.makeTimedCache(10 * 60 * 1000);
+        this.cached = (0, timed_cache_1.makeTimedCache)(10 * 60 * 1000);
         this.fileTSs = undefined;
-        this.fileProc = new processes_1.SingleProc();
+        this.fileProc = new synced_1.SingleProc();
         Object.seal(this);
     }
     static async makeWith(files) {
@@ -297,7 +297,7 @@ class MsgIndex {
             }
             if (msgFound) {
                 removeFrom(records, msgId);
-                if ((records.fileTS !== null) && (records.ordered.length === 0)) {
+                if (!!records.fileTS && (records.ordered.length === 0)) {
                     await this.files.deleteFile(records.fileTS + INDEX_EXT);
                 }
                 else {

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgOnDisk = void 0;
 const fs = require("../../../lib-common/async-fs-node");
 const obj_on_disk_1 = require("../../../lib-client/objs-on-disk/obj-on-disk");
-const processes_1 = require("../../../lib-common/processes");
+const synced_1 = require("../../../lib-common/processes/synced");
 const error_1 = require("../../../lib-common/exceptions/error");
 const path_1 = require("path");
 const META_FNAME = 'meta.json';
@@ -39,7 +39,7 @@ class MsgOnDisk {
         this.msgDownloader = msgDownloader;
         this.status = status;
         this.objsIds = objsIds;
-        this.syncProc = new processes_1.SingleProc();
+        this.syncProc = new synced_1.SingleProc();
         this.objs = new Map();
         this.objDownloader = this.msgDownloader.getObjDownloader(msgId);
         Object.freeze(this.objDownloader);
@@ -63,7 +63,7 @@ class MsgOnDisk {
         return readJSON(this.msgFolderPath, META_FNAME, this.msgId);
     }
     objFilePath(objId) {
-        return path_1.join(this.msgFolderPath, objId);
+        return (0, path_1.join)(this.msgFolderPath, objId);
     }
     async getObjFile(objId) {
         let file = this.objs.get(objId);
@@ -79,7 +79,7 @@ class MsgOnDisk {
             if (exc.notFound) {
                 return;
             }
-            throw error_1.errWithCause(exc, `Cannot stat message obj at ${path}`);
+            throw (0, error_1.errWithCause)(exc, `Cannot stat message obj at ${path}`);
         }));
         file = (isOnDisk ?
             await obj_on_disk_1.ObjOnDisk.forExistingFile(objId, 0, path, this.objDownloader) :
@@ -119,16 +119,16 @@ exports.MsgOnDisk = MsgOnDisk;
 Object.freeze(MsgOnDisk.prototype);
 Object.freeze(MsgOnDisk);
 async function readJSON(msgFolderPath, fname, msgId) {
-    const path = path_1.join(msgFolderPath, fname);
+    const path = (0, path_1.join)(msgFolderPath, fname);
     try {
         return JSON.parse(await fs.readFile(path, { flag: 'r', encoding: 'utf8' }));
     }
     catch (err) {
-        throw error_1.errWithCause(err, `Can't read file ${fname} of message ${msgId}`);
+        throw (0, error_1.errWithCause)(err, `Can't read file ${fname} of message ${msgId}`);
     }
 }
 async function writeJSON(msgFolderPath, fname, json, exclusive = false) {
-    const path = path_1.join(msgFolderPath, fname);
+    const path = (0, path_1.join)(msgFolderPath, fname);
     await fs.writeFile(path, JSON.stringify(json), { flag: (exclusive ? 'wx' : 'w') });
 }
 function objIdsFromMeta(meta) {

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

@@ -2,15 +2,14 @@ import { InboxPathForUser } from '../app-files';
 import { StorageGetter } from '../../lib-client/3nstorage/xsp-fs/common';
 import { GetSigner } from '../id-manager';
 import { AsyncSBoxCryptor } from 'xsp-files';
-import { NetClient } from '../../lib-client/request-utils';
 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;
 export declare class ASMail {
     private readonly cryptor;
-    private readonly makeNet;
     private readonly inboxPathForUser;
     private readonly logger;
     private keyring;
@@ -19,7 +18,8 @@ export declare class ASMail {
     private delivery;
     private config;
     private sendingParams;
-    constructor(cryptor: AsyncSBoxCryptor, makeNet: () => NetClient, inboxPathForUser: InboxPathForUser, logger: Logger);
+    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;
     private setupKeyring;

package/build/core/asmail/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
@@ -23,6 +23,7 @@ const keyring_1 = require("./keyring");
 const config_1 = require("./config");
 const delivery_1 = require("./delivery");
 const sending_params_1 = require("./sending-params");
+const fs_sync_utils_1 = require("../../lib-client/fs-sync-utils");
 const KEYRING_DATA_FOLDER = 'keyring';
 const INBOX_DATA_FOLDER = 'inbox';
 const CONFIG_DATA_FOLDER = 'config';
@@ -31,7 +32,6 @@ 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,11 +40,13 @@ 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) {
         try {
             this.address = address;
+            await (0, fs_sync_utils_1.getRemoteFolderChanges)(syncedFS);
             await this.setupConfig(getSigner, syncedFS, makeResolver('asmail'));
             await Promise.all([
                 this.setupKeyring(syncedFS),
@@ -54,23 +56,24 @@ class ASMail {
                 this.setupInbox(syncedFS, getSigner, getStorages, makeResolver),
                 this.setupDelivery(localFS, getSigner, makeResolver)
             ]);
+            await (0, fs_sync_utils_1.uploadFolderChangesIfAny)(syncedFS);
             await syncedFS.close();
             await localFS.close();
         }
         catch (err) {
-            throw error_1.errWithCause(err, 'Failed to initialize ASMail');
+            throw (0, error_1.errWithCause)(err, 'Failed to initialize ASMail');
         }
     }
     async setupConfig(getSigner, syncedFS, resolver) {
-        const fs = await syncedFS.writableSubRoot(CONFIG_DATA_FOLDER);
+        const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, CONFIG_DATA_FOLDER);
         this.config = await config_1.ConfigOfASMailServer.makeAndStart(this.address, getSigner, resolver, this.makeNet(), fs);
     }
     async setupKeyring(syncedFS) {
-        const fs = await syncedFS.writableSubRoot(KEYRING_DATA_FOLDER);
+        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);
     }
     async setupSendingParams(syncedFS) {
-        const fs = await syncedFS.writableSubRoot(SEND_PARAMS_DATA_FOLDER);
+        const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, SEND_PARAMS_DATA_FOLDER);
         this.sendingParams = await sending_params_1.SendingParamsHolder.makeAndStart(fs, this.config.anonSenderInvites);
     }
     async setupDelivery(localFS, getSigner, makeResolver) {
@@ -96,7 +99,7 @@ class ASMail {
     }
     async setupInbox(syncedFS, getSigner, getStorages, makeResolver) {
         const cachePath = this.inboxPathForUser(this.address);
-        const inboxFS = await syncedFS.writableSubRoot(INBOX_DATA_FOLDER);
+        const inboxFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, INBOX_DATA_FOLDER);
         this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxFS, {
             address: this.address,
             cryptor: this.cryptor,
@@ -117,7 +120,7 @@ class ASMail {
         const w = {
             getUserId: async () => this.address,
             delivery: this.delivery.wrap(),
-            inbox: this.inbox.wrap()
+            inbox: this.inbox.wrap(),
         };
         return Object.freeze(w);
     }
@@ -127,4 +130,6 @@ class ASMail {
     }
 }
 exports.ASMail = ASMail;
+Object.freeze(ASMail.prototype);
+Object.freeze(ASMail);
 Object.freeze(exports);

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

@@ -30,10 +30,10 @@ const service_locator_1 = require("../../lib-client/service-locator");
  * @param certs is an object with a MailerId certificates chain for a public key
  */
 async function checkAndExtractPKey(client, resolver, address, certs) {
-    address = canonical_address_1.toCanonicalAddress(address);
+    address = (0, canonical_address_1.toCanonicalAddress)(address);
     const validAt = Math.round(Date.now() / 1000);
     // get MailerId provider's info with a root certificate(s)
-    const data = await service_locator_1.getMailerIdInfoFor(resolver, client, address);
+    const data = await (0, service_locator_1.getMailerIdInfoFor)(resolver, client, address);
     // TODO choose proper root certificate, as it may not be current one
     const rootAddr = data.domain;
     const rootCert = data.info.currentCert;
@@ -56,13 +56,13 @@ async function checkAndExtractPKeyWithAddress(client, resolver, certs, validAt)
     // address here comes from certificates; we return it for further checks
     let address;
     try {
-        address = jwkeys_1.getKeyCert(certs.pkeyCert).cert.principal.address;
+        address = (0, jwkeys_1.getKeyCert)(certs.pkeyCert).cert.principal.address;
     }
     catch (err) {
-        throw mid_sigs_NaCl_Ed_1.makeMalformedCertsException(`Cannot read public key certificate`, err);
+        throw (0, mid_sigs_NaCl_Ed_1.makeMalformedCertsException)(`Cannot read public key certificate`, err);
     }
     // get MailerId provider's info with a root certificate(s)
-    const data = await service_locator_1.getMailerIdInfoFor(resolver, client, address);
+    const data = await (0, service_locator_1.getMailerIdInfoFor)(resolver, client, address);
     // TODO choose proper root certificate, as it may not be current one
     const rootAddr = data.domain;
     const rootCert = data.info.currentCert;