core-3nweb-client-lib 0.26.1 → 0.27.0

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.js

@@ -148,6 +148,9 @@ class IdManager {
             };
             await this.localFS.writeJSONFile(LOGIN_KEY_FILE_NAME, json);
             await this.syncedFS.writeJSONFile(LOGIN_KEY_FILE_NAME, json);
+            // XXX must add work with not-online condition
+            await this.syncedFS.v.sync.upload(LOGIN_KEY_FILE_NAME);
+            await this.syncedFS.v.sync.upload('');
         }
         else {
             await this.ensureLocalCacheOfKeys();
@@ -203,7 +206,7 @@ class IdManager {
             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);
@@ -252,11 +255,11 @@ function notFoundOrReThrow(exc) {
     }
 }
 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/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>;

package/build/core/index.js

@@ -42,7 +42,7 @@ class Core {
         this.closingProc = undefined;
         this.initForNewUser = async (u) => {
             // 1) init of id manager without setting fs
-            const idManager = await id_manager_1.IdManager.initInOneStepWithoutStore(u.address, u.midSKey.default, this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const idManager = await id_manager_1.IdManager.initInOneStepWithoutStore(u.address, u.midSKey.default, this.makeResolver('mailerid'), () => this.makeNet(), this.logger.logError, this.logger.logWarning);
             if (!idManager) {
                 throw new Error(`Failed to provision MailerId identity`);
             }
@@ -57,7 +57,7 @@ class Core {
         };
         this.initForExistingUserWithoutCache = async (address) => {
             // 1) init of id manager without setting fs
-            const stepTwo = await id_manager_1.IdManager.initWithoutStore(address, this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const stepTwo = await id_manager_1.IdManager.initWithoutStore(address, this.makeResolver('mailerid'), () => this.makeNet(), this.logger.logError, this.logger.logWarning);
             if (!stepTwo) {
                 return;
             }
@@ -82,14 +82,14 @@ class Core {
             if (!completeStorageInit) {
                 return;
             }
-            const idManager = await id_manager_1.IdManager.initFromLocalStore(address, await this.storages.makeLocalFSForApp(MAILERID_APP_NAME), this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const idManager = await id_manager_1.IdManager.initFromLocalStore(address, await this.storages.makeLocalFSForApp(MAILERID_APP_NAME), this.makeResolver('mailerid'), () => this.makeNet(), this.logger.logError, this.logger.logWarning);
             if (idManager) {
                 const res = await completeStorageInit(idManager.getSigner);
                 await idManager.setStorages(undefined, await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME));
                 return (res ? idManager : undefined);
             }
             return async (midLoginKey) => {
-                const idManager = await id_manager_1.IdManager.initInOneStepWithoutStore(address, midLoginKey, this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+                const idManager = await id_manager_1.IdManager.initInOneStepWithoutStore(address, midLoginKey, this.makeResolver('mailerid'), () => this.makeNet(), this.logger.logError, this.logger.logWarning);
                 if (!idManager) {
                     return;
                 }
@@ -106,13 +106,13 @@ class Core {
         Object.seal(this);
     }
     static make(conf, makeNet, makeResolver, makeCryptor) {
-        const dirs = app_files_1.appDirs(conf.dataDir);
-        const logger = log_to_file_1.makeLogger(dirs.getUtilFS());
+        const dirs = (0, app_files_1.appDirs)(conf.dataDir);
+        const logger = (0, log_to_file_1.makeLogger)(dirs.getUtilFS());
         const core = new Core(makeNet, makeResolver, makeCryptor, dirs, logger, conf.signUpUrl);
         return core;
     }
     start() {
-        const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, this.makeNet, this.appDirs.getUsersOnDisk, this.logger.logError);
+        const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, () => this.makeNet(), this.appDirs.getUsersOnDisk, this.logger.logError);
         const signIn = new sign_in_1.SignIn(this.cryptor.cryptor, this.initForExistingUserWithoutCache, this.initForExistingUserWithCache, this.appDirs.getUsersOnDisk, this.logger.logError);
         const capsForStartup = {
             signUp: signUp.exposedService(),
@@ -120,10 +120,10 @@ class Core {
         };
         Object.freeze(capsForStartup);
         const initFromSignUp$ = signUp.newUser$
-            .pipe(operators_1.mergeMap(this.initForNewUser, 1));
+            .pipe((0, operators_1.mergeMap)(this.initForNewUser, 1));
         const initFromSignIn$ = signIn.existingUser$;
-        const coreInit = rxjs_1.merge(initFromSignIn$, initFromSignUp$)
-            .pipe(operators_1.take(1), operators_1.mergeMap(idManager => this.initCore(idManager), 1))
+        const coreInit = (0, rxjs_1.merge)(initFromSignIn$, initFromSignUp$)
+            .pipe((0, operators_1.take)(1), (0, operators_1.mergeMap)(idManager => this.initCore(idManager), 1))
             .toPromise();
         return { coreInit, capsForStartup };
     }
@@ -201,7 +201,7 @@ class Core {
             return this.idManager.getId();
         }
         catch (err) {
-            throw error_1.errWithCause(err, 'Failed to initialize core');
+            throw (0, error_1.errWithCause)(err, 'Failed to initialize core');
         }
     }
     getStorages() {
@@ -229,7 +229,7 @@ function makeStoragePolicy(appDomain, requestedCAPs) {
         const okDomains = capReq.appFS
             .filter(fsInfo => (fsInfo.domain === appDomain) ||
             fsInfo.domain.endsWith('.' + appDomain))
-            .map(fsInfo => json_utils_1.copy(fsInfo));
+            .map(fsInfo => (0, json_utils_1.copy)(fsInfo));
         policy = {
             canOpenAppFS: severalDomainsAppFSChecker(okDomains)
         };
@@ -259,7 +259,7 @@ function makeStoragePolicy(appDomain, requestedCAPs) {
 }
 const noFS = () => false;
 function singleDomainAppFSChecker(appFS) {
-    const revDomain = storage_1.reverseDomain(appFS.domain);
+    const revDomain = (0, storage_1.reverseDomain)(appFS.domain);
     const allowedType = appFS.storage;
     return (appFolder, type) => {
         return (appFSTypeAllowed(allowedType, type) && (appFolder === revDomain));
@@ -286,7 +286,7 @@ function appFSTypeAllowed(allowed, type) {
 }
 function severalDomainsAppFSChecker(appFSs) {
     const settings = appFSs.map(s => ({
-        revDomain: storage_1.reverseDomain(s.domain),
+        revDomain: (0, storage_1.reverseDomain)(s.domain),
         storage: s.storage
     }));
     return (appFolder, type) => !!settings.find(s => ((s.revDomain === appFolder) && appFSTypeAllowed(s.storage, type)));

package/build/core/sign-in.js

@@ -43,9 +43,9 @@ class SignIn {
             }
             try {
                 const midKeyProgressCB = makeKeyGenProgressCB(0, 50, progressCB);
-                const midKeyGen = async (params) => (await key_derivation_1.deriveMidKeyPair(this.cryptor, pass, params, midKeyProgressCB)).skey;
+                const midKeyGen = async (params) => (await (0, key_derivation_1.deriveMidKeyPair)(this.cryptor, pass, params, midKeyProgressCB)).skey;
                 const storeKeyProgressCB = makeKeyGenProgressCB(51, 100, progressCB);
-                const storeKeyGen = (params) => key_derivation_1.deriveStorageSKey(this.cryptor, pass, params, storeKeyProgressCB);
+                const storeKeyGen = (params) => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
                 const idManager = await this.completeInitWithoutCache(midKeyGen, storeKeyGen);
                 if (!idManager) {
                     return false;
@@ -62,7 +62,7 @@ class SignIn {
         this.useExistingStorage = async (user, pass, progressCB) => {
             try {
                 const storeKeyProgressCB = makeKeyGenProgressCB(0, 99, progressCB);
-                const storeKeyGen = params => key_derivation_1.deriveStorageSKey(this.cryptor, pass, params, storeKeyProgressCB);
+                const storeKeyGen = params => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
                 const res = await this.initWithCache(user, storeKeyGen);
                 if (!res) {
                     return false;
@@ -73,7 +73,7 @@ class SignIn {
                 }
                 progressCB(49);
                 const midKeyProgressCB = makeKeyGenProgressCB(50, 99, progressCB);
-                const midKeyGen = async (params) => (await key_derivation_1.deriveMidKeyPair(this.cryptor, pass, params, midKeyProgressCB)).skey;
+                const midKeyGen = async (params) => (await (0, key_derivation_1.deriveMidKeyPair)(this.cryptor, pass, params, midKeyProgressCB)).skey;
                 const idManager = await res(midKeyGen);
                 if (!idManager) {
                     return false;
@@ -98,7 +98,7 @@ class SignIn {
     }
     async logAndWrap(err, msg) {
         await this.logError(err, msg);
-        return error_1.errWithCause(err, msg);
+        return (0, error_1.errWithCause)(err, msg);
     }
 }
 exports.SignIn = SignIn;

package/build/core/sign-up.js

@@ -42,13 +42,13 @@ const SALT_LEN = 32;
 const KEY_ID_LEN = 10;
 async function makeLabeledMidLoginKey(cryptor) {
     const sk = await random.bytes(ecma_nacl_1.box.KEY_LENGTH);
-    const skey = jwkeys_1.keyToJson({
+    const skey = (0, jwkeys_1.keyToJson)({
         k: sk,
         alg: ecma_nacl_1.box.JWK_ALG_NAME,
         use: jwkeys_1.use.MID_PKLOGIN,
         kid: await random.stringOfB64Chars(KEY_ID_LEN)
     });
-    const pkey = jwkeys_1.keyToJson({
+    const pkey = (0, jwkeys_1.keyToJson)({
         k: await cryptor.box.generate_pubkey(sk),
         alg: skey.alg,
         use: skey.use,
@@ -66,7 +66,7 @@ class SignUp {
         this.store = undefined;
         this.netLazyInit = undefined;
         this.getAvailableAddresses = async (name, signupToken) => {
-            const addresses = await _3nweb_signup_1.checkAvailableAddressesForName(this.net, this.serviceURL, name, signupToken);
+            const addresses = await (0, _3nweb_signup_1.checkAvailableAddressesForName)(this.net, this.serviceURL, name, signupToken);
             return addresses;
         };
         this.createUserParams = async (pass, progressCB) => {
@@ -75,11 +75,11 @@ class SignUp {
         };
         this.addUser = async (address, signupToken) => {
             for (const user of await this.getUsersOnDisk()) {
-                if (canonical_address_1.areAddressesEqual(address, user)) {
+                if ((0, canonical_address_1.areAddressesEqual)(address, user)) {
                     throw new Error(`Account ${user} already exists on a disk.`);
                 }
             }
-            const accountCreated = await _3nweb_signup_1.addUser(this.net, this.serviceURL, {
+            const accountCreated = await (0, _3nweb_signup_1.addUser)(this.net, this.serviceURL, {
                 userId: address,
                 mailerId: this.mid.params,
                 storage: this.store.params,
@@ -113,7 +113,7 @@ class SignUp {
         return this.netLazyInit;
     }
     setServiceURL(serviceURL) {
-        const url = url_1.parse(serviceURL);
+        const url = (0, url_1.parse)(serviceURL);
         if (url.protocol !== 'https:') {
             throw new Error("Url protocol must be https.");
         }
@@ -138,7 +138,7 @@ class SignUp {
             p: defaultDerivParams.p,
             salt: buffer_utils_1.base64.pack(await random.bytes(SALT_LEN))
         };
-        const progressCB = sign_in_1.makeKeyGenProgressCB(progressStart, progressEnd, originalProgressCB);
+        const progressCB = (0, sign_in_1.makeKeyGenProgressCB)(progressStart, progressEnd, originalProgressCB);
         const skey = await keyDeriv.deriveStorageSKey(this.cryptor, pass, derivParams, progressCB);
         this.store = {
             skey: skey,
@@ -154,7 +154,7 @@ class SignUp {
             p: defaultDerivParams.p,
             salt: buffer_utils_1.base64.pack(await random.bytes(SALT_LEN))
         };
-        const progressCB = sign_in_1.makeKeyGenProgressCB(progressStart, progressEnd, originalProgressCB);
+        const progressCB = (0, sign_in_1.makeKeyGenProgressCB)(progressStart, progressEnd, originalProgressCB);
         const defaultPair = await keyDeriv.deriveMidKeyPair(this.cryptor, pass, derivParams, progressCB, jwkeys_1.use.MID_PKLOGIN, '_');
         const labeledKey = await makeLabeledMidLoginKey(this.cryptor);
         this.mid = {
@@ -171,7 +171,7 @@ class SignUp {
     }
     async logAndWrap(err, msg) {
         await this.logError(err, msg);
-        return error_1.errWithCause(err, msg);
+        return (0, error_1.errWithCause)(err, msg);
     }
     forgetKeys() {
         this.store = undefined;

package/build/core/storage/common/json-saving.js

@@ -54,7 +54,7 @@ class JSONSavingProc {
             this.jsonNeedsSaving = false;
             const serialForm = this.getForSerialization();
             if (serialForm === undefined) {
-                await async_fs_node_1.unlink(this.path)
+                await (0, async_fs_node_1.unlink)(this.path)
                     .catch((e) => {
                     if (!e.notFound) {
                         throw e;
@@ -63,7 +63,7 @@ class JSONSavingProc {
             }
             else {
                 const json = JSON.stringify(serialForm);
-                await async_fs_node_1.writeFile(this.path, json, { encoding: 'utf8' });
+                await (0, async_fs_node_1.writeFile)(this.path, json, { encoding: 'utf8' });
             }
         }
         finally {

package/build/core/storage/common/obj-info-file.d.ts

@@ -9,10 +9,10 @@ export interface VersionsInfo {
      */
     archived?: number[];
     /**
-     * This is a map from base version to diff-ed version(s), that use(s) base.
+     * This is a map from base version to diff-ed version, that uses base.
      */
     baseToDiff: {
-        [baseVersion: number]: number[];
+        [baseVersion: number]: number;
     };
     /**
      * This is a map from diff version to base version.
@@ -27,7 +27,8 @@ export interface VersionsInfo {
  * @param diffVer
  * @param baseVer
  */
-export declare function addBaseToDiffLinkInStatus(versions: VersionsInfo, diffVer: number, baseVer: number): void;
+export declare function addBaseToDiffLinkInVersInfo(versions: VersionsInfo, diffVer: number, baseVer: number): void;
+export declare function isVersionIn(version: number, vers: VersionsInfo): boolean;
 /**
  * This function removes given version from versions info, if it is neither
  * archived, nor is a base for another version. If given version is itself
@@ -37,8 +38,15 @@ export declare function addBaseToDiffLinkInStatus(versions: VersionsInfo, diffVe
  * @param ver
  */
 export declare function rmNonArchVersionsIn(versions: VersionsInfo, ver: number): void;
-export declare function rmArchVersionsIn(versions: VersionsInfo, ver: number): void;
+export declare function rmArchVersionFrom(versions: VersionsInfo, ver: number): boolean;
 export declare function setCurrentVersionIn(versions: VersionsInfo, version: number, baseVer: number | undefined): void;
 export declare function rmCurrentVersionIn(versions: VersionsInfo): number | undefined;
+export declare function rmVersionIn(version: number, vers: VersionsInfo): void;
 export declare function nonGarbageVersionsIn(versions: VersionsInfo): Set<number>;
+export interface NonGarbageVersions {
+    gcMaxVer?: number;
+    nonGarbage: Set<number>;
+}
 export declare function addWithBasesTo(nonGarbage: Set<number>, ver: number | undefined, versions: VersionsInfo): void;
+export declare function addArchived(versions: VersionsInfo, version: number): boolean;
+export declare function isEmptyVersions(versions: VersionsInfo): boolean;