core-3nweb-client-lib 0.26.1 → 0.27.3

package/build/core/index.js

@@ -42,38 +42,45 @@ 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);
-            if (!idManager) {
+            const stepTwo = await id_manager_1.IdManager.initWithoutStore(u.address, this.makeResolver('mailerid'), () => this.makeNet(), this.logger.logError, this.logger.logWarning);
+            if (!stepTwo) {
+                throw new Error(`MailerId server doesn't recognize identity ${u.address}`);
+            }
+            // 2) complete id manager login, without use of fs
+            const idManagerInit = await stepTwo(u.midSKey.default);
+            if (!idManagerInit) {
                 throw new Error(`Failed to provision MailerId identity`);
             }
-            // 2) setup storage
-            const storesUp = await this.storages.initFromRemote(u.address, idManager.getSigner, u.storeSKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
+            const { idManager, setupManagerStorage } = idManagerInit;
+            // 3) initialize all storages
+            const storesUp = await this.storages.initFreshForNewUser(u.address, idManager.getSigner, u.storeParams, u.storeSKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
             if (!storesUp) {
                 throw new Error(`Stores failed to initialize`);
             }
             // 3) give id manager fs, in which it will record labeled key(s)
-            await idManager.setStorages(await this.storages.makeLocalFSForApp(MAILERID_APP_NAME), await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME), [u.midSKey.labeled]);
+            await setupManagerStorage(await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME), [u.midSKey.labeled]);
             return idManager;
         };
         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;
             }
             return async (midLoginKey, storageKey) => {
                 // 2) complete id manager login, without use of fs
-                const idManager = await stepTwo(midLoginKey);
-                if (!idManager) {
+                const idManagerInit = await stepTwo(midLoginKey);
+                if (!idManagerInit) {
                     return;
                 }
+                const { idManager, setupManagerStorage } = idManagerInit;
                 // 3) initialize all storages
                 const storeDone = await this.storages.initFromRemote(address, idManager.getSigner, storageKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
                 if (!storeDone) {
                     return;
                 }
                 // 4) complete initialization of id manager
-                await idManager.setStorages(await this.storages.makeLocalFSForApp(MAILERID_APP_NAME), await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME));
+                await setupManagerStorage(await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME));
                 return idManager;
             };
         };
@@ -82,21 +89,12 @@ 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);
-            if (idManager) {
-                const res = await completeStorageInit(idManager.getSigner);
-                await idManager.setStorages(undefined, await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME));
-                return (res ? idManager : undefined);
+            const idManager = await id_manager_1.IdManager.initFromCachedStore(address, await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME), this.makeResolver('mailerid'), () => this.makeNet(), this.logger.logError, this.logger.logWarning);
+            if (!idManager) {
+                return;
             }
-            return async (midLoginKey) => {
-                const idManager = await id_manager_1.IdManager.initInOneStepWithoutStore(address, midLoginKey, this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
-                if (!idManager) {
-                    return;
-                }
-                const res = await completeStorageInit(idManager.getSigner);
-                await idManager.setStorages(await this.storages.makeLocalFSForApp(MAILERID_APP_NAME), await this.storages.makeSyncedFSForApp(MAILERID_APP_NAME));
-                return (res ? idManager : undefined);
-            };
+            completeStorageInit(idManager.getSigner);
+            return idManager;
         };
         this.closeBroadcast = new rxjs_1.Subject();
         this.close$ = this.closeBroadcast.asObservable();
@@ -106,13 +104,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.bind(this), 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 +118,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 +199,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 +227,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 +257,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 +284,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.d.ts

@@ -6,8 +6,7 @@ import { LogError } from '../lib-client/logging/log-to-file';
 export declare type GenerateKey = (derivParams: ScryptGenParams) => Promise<Uint8Array>;
 export declare type StartInitWithoutCache = (address: string) => Promise<CompleteInitWithoutCache | undefined>;
 export declare type CompleteInitWithoutCache = (midLoginKey: GenerateKey, storageKey: GenerateKey) => Promise<IdManager | undefined>;
-export declare type InitWithCache = (address: string, storageKey: GenerateKey) => Promise<IdManager | undefined | InitTwoWithCache>;
-export declare type InitTwoWithCache = (midLoginKey: GenerateKey) => Promise<IdManager | undefined>;
+export declare type InitWithCache = (address: string, storageKey: GenerateKey) => Promise<IdManager | undefined>;
 declare type SignInService = web3n.startup.SignInService;
 export declare class SignIn {
     private cryptor;

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,24 +62,15 @@ 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 res = await this.initWithCache(user, storeKeyGen);
-                if (!res) {
-                    return false;
-                }
-                if (typeof res === 'object') {
-                    this.doneBroadcast.next(res);
+                const storeKeyGen = params => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
+                const idManager = await this.initWithCache(user, storeKeyGen);
+                if (idManager) {
+                    this.doneBroadcast.next(idManager);
                     return true;
                 }
-                progressCB(49);
-                const midKeyProgressCB = makeKeyGenProgressCB(50, 99, progressCB);
-                const midKeyGen = async (params) => (await key_derivation_1.deriveMidKeyPair(this.cryptor, pass, params, midKeyProgressCB)).skey;
-                const idManager = await res(midKeyGen);
-                if (!idManager) {
+                else {
                     return false;
                 }
-                this.doneBroadcast.next(idManager);
-                return true;
             }
             catch (err) {
                 throw await this.logAndWrap(err, 'Failing to start in a state with cache');
@@ -98,7 +89,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.d.ts

@@ -1,5 +1,6 @@
 import { NetClient } from '../lib-client/request-utils';
 import { JsonKey } from '../lib-common/jwkeys';
+import * as keyDeriv from '../lib-client/key-derivation';
 import { GetUsersOnDisk } from './app-files';
 import { Cryptor } from '../lib-client/cryptor/cryptor';
 import { LogError } from '../lib-client/logging/log-to-file';
@@ -40,5 +41,6 @@ export interface CreatedUser {
         labeled: JsonKey;
     };
     storeSKey: Uint8Array;
+    storeParams: keyDeriv.ScryptGenParams;
 }
 export {};

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,
@@ -96,7 +96,8 @@ class SignUp {
                     default: this.mid.defaultSKey,
                     labeled: this.mid.labeledSKey
                 },
-                storeSKey: this.store.skey
+                storeSKey: this.store.skey,
+                storeParams: this.store.params.kdParams
             });
             this.forgetKeys();
             return true;
@@ -113,7 +114,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 +139,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 +155,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 +172,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;

package/build/core/storage/common/obj-info-file.js

@@ -16,13 +16,13 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addWithBasesTo = exports.nonGarbageVersionsIn = exports.rmCurrentVersionIn = exports.setCurrentVersionIn = exports.rmArchVersionsIn = exports.rmNonArchVersionsIn = exports.addBaseToDiffLinkInStatus = exports.readJSONInfoFileIn = void 0;
+exports.isEmptyVersions = exports.addArchived = exports.addWithBasesTo = exports.nonGarbageVersionsIn = exports.rmVersionIn = exports.rmCurrentVersionIn = exports.setCurrentVersionIn = exports.rmArchVersionFrom = exports.rmNonArchVersionsIn = exports.isVersionIn = exports.addBaseToDiffLinkInVersInfo = exports.readJSONInfoFileIn = void 0;
 const fs = require("../../../lib-common/async-fs-node");
 const path_1 = require("path");
 const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
 async function readJSONInfoFileIn(objFolder, fileName) {
     try {
-        const infoJSONStr = await fs.readFile(path_1.join(objFolder, fileName), { encoding: 'utf8' }).catch((exc) => {
+        const infoJSONStr = await fs.readFile((0, path_1.join)(objFolder, fileName), { encoding: 'utf8' }).catch((exc) => {
             if (!exc.notFound) {
                 throw exc;
             }
@@ -35,7 +35,7 @@ async function readJSONInfoFileIn(objFolder, fileName) {
         return status;
     }
     catch (err) {
-        throw exceptions_1.makeStorageException({
+        throw (0, exceptions_1.makeStorageException)({
             message: `Can't read and parse content of obj info file ${fileName} in obj folder ${objFolder}`,
             cause: err
         });
@@ -48,22 +48,24 @@ exports.readJSONInfoFileIn = readJSONInfoFileIn;
  * @param diffVer
  * @param baseVer
  */
-function addBaseToDiffLinkInStatus(versions, diffVer, baseVer) {
+function addBaseToDiffLinkInVersInfo(versions, diffVer, baseVer) {
     if (diffVer <= baseVer) {
         throw new Error(`Given diff version ${diffVer} is not greater than base version ${baseVer}`);
     }
     versions.diffToBase[diffVer] = baseVer;
-    const diffs = versions.baseToDiff[baseVer];
-    if (diffs) {
-        if (diffs.indexOf(diffVer) < 0) {
-            diffs.push(diffVer);
-        }
+    versions.baseToDiff[baseVer] = diffVer;
+}
+exports.addBaseToDiffLinkInVersInfo = addBaseToDiffLinkInVersInfo;
+function isVersionIn(version, vers) {
+    if (vers.current === version) {
+        return true;
     }
-    else {
-        versions.baseToDiff[baseVer] = [diffVer];
+    if (vers.archived && vers.archived.includes(version)) {
+        return true;
     }
+    return false;
 }
-exports.addBaseToDiffLinkInStatus = addBaseToDiffLinkInStatus;
+exports.isVersionIn = isVersionIn;
 /**
  * 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
@@ -73,49 +75,41 @@ exports.addBaseToDiffLinkInStatus = addBaseToDiffLinkInStatus;
  * @param ver
  */
 function rmNonArchVersionsIn(versions, ver) {
-    if (!versions.archived
-        || !versions.archived.includes(ver)) {
+    if (versions.archived
+        && versions.archived.includes(ver)) {
         return;
     }
     if (versions.baseToDiff[ver]) {
         return;
     }
     const base = versions.diffToBase[ver];
-    if (typeof base !== 'number') {
-        return;
-    }
-    delete versions.diffToBase[ver];
-    const diffs = versions.baseToDiff[base];
-    if (!diffs) {
-        return;
-    }
-    const diffInd = diffs.indexOf(ver);
-    if (diffInd < 0) {
-        return;
-    }
-    diffs.splice(diffInd, 1);
-    if (diffs.length === 0) {
+    if (base) {
+        delete versions.diffToBase[ver];
         delete versions.baseToDiff[base];
         rmNonArchVersionsIn(versions, base);
     }
 }
 exports.rmNonArchVersionsIn = rmNonArchVersionsIn;
-function rmArchVersionsIn(versions, ver) {
+function rmArchVersionFrom(versions, ver) {
     if (!versions.archived) {
-        return;
+        return false;
     }
     const vInd = versions.archived.indexOf(ver);
     if (vInd < 0) {
-        return;
+        return false;
     }
     versions.archived.splice(vInd, 1);
+    if (versions.archived.length === 0) {
+        versions.archived = undefined;
+    }
     rmNonArchVersionsIn(versions, ver);
+    return true;
 }
-exports.rmArchVersionsIn = rmArchVersionsIn;
+exports.rmArchVersionFrom = rmArchVersionFrom;
 function setCurrentVersionIn(versions, version, baseVer) {
     if (baseVer !== undefined) {
         // base->diff links should be added before removals
-        addBaseToDiffLinkInStatus(versions, version, baseVer);
+        addBaseToDiffLinkInVersInfo(versions, version, baseVer);
     }
     const initCurrent = versions.current;
     if (typeof initCurrent === 'number') {
@@ -128,11 +122,21 @@ function rmCurrentVersionIn(versions) {
     const current = versions.current;
     if (typeof current === 'number') {
         rmNonArchVersionsIn(versions, current);
-        delete versions.current;
+        versions.current = undefined;
     }
     return current;
 }
 exports.rmCurrentVersionIn = rmCurrentVersionIn;
+function rmVersionIn(version, vers) {
+    if (vers.current === version) {
+        vers.current = undefined;
+        rmNonArchVersionsIn(vers, version);
+    }
+    if (isVersionIn(version, vers)) {
+        rmArchVersionFrom(vers, version);
+    }
+}
+exports.rmVersionIn = rmVersionIn;
 function nonGarbageVersionsIn(versions) {
     const nonGarbage = new Set();
     addWithBasesTo(nonGarbage, versions.current, versions);
@@ -157,4 +161,32 @@ function addWithBasesTo(nonGarbage, ver, versions) {
     }
 }
 exports.addWithBasesTo = addWithBasesTo;
+function addArchived(versions, version) {
+    if (!versions.archived) {
+        versions.archived = [];
+    }
+    else if (versions.archived.includes(version)) {
+        return false;
+    }
+    versions.archived.push(version);
+    versions.archived.sort();
+    return true;
+}
+exports.addArchived = addArchived;
+function isEmptyVersions(versions) {
+    if (versions.current) {
+        return false;
+    }
+    if (!versions.archived) {
+        return true;
+    }
+    else if (versions.archived.length > 0) {
+        return false;
+    }
+    else {
+        versions.archived = undefined;
+        return true;
+    }
+}
+exports.isEmptyVersions = isEmptyVersions;
 Object.freeze(exports);

package/build/core/storage/common/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function getAndRemoveOneFrom<T>(set: Set<T>): T | undefined;
+export declare function noop(): void;

package/build/core/storage/common/utils.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ Copyright (C) 2016 - 2020 3NSoft Inc.
+
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.noop = exports.getAndRemoveOneFrom = void 0;
+function getAndRemoveOneFrom(set) {
+    const iter = set.values();
+    const { value, done } = iter.next();
+    if (done) {
+        return;
+    }
+    set.delete(value);
+    return value;
+}
+exports.getAndRemoveOneFrom = getAndRemoveOneFrom;
+function noop() { }
+exports.noop = noop;
+Object.freeze(exports);

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

@@ -2,25 +2,14 @@ import { GetSigner } from '../id-manager';
 import { GenerateKey } from '../sign-in';
 import { StorageGetter } from '../../lib-client/3nstorage/xsp-fs/common';
 import { ServiceLocator } from '../../lib-client/service-locator';
+import { ScryptGenParams } from '../../lib-client/key-derivation';
 import { AsyncSBoxCryptor } from 'xsp-files';
-import { NetClient } from '../../lib-client/request-utils';
 import { StoragePathForUser } from '../app-files';
 import { LogError } from '../../lib-client/logging/log-to-file';
+import { MakeNet } from '..';
 declare type WritableFS = web3n.files.WritableFS;
 declare type StorageType = web3n.storage.StorageType;
 declare type FSItem = web3n.files.FSItem;
-export declare const sysFolders: {
-    appData: string;
-    apps: string;
-    packages: string;
-    sharedLibs: string;
-    userFiles: string;
-};
-/**
- * This function creates initial folder structure in a given root.
- * @param root
- */
-export declare function initSysFolders(root: WritableFS): Promise<void>;
 export declare class Storages implements FactoryOfFSs {
     private cryptor;
     private storageDirForUser;
@@ -42,8 +31,9 @@ export declare class Storages implements FactoryOfFSs {
      * This is a storage getter for links and linking in synced storage.
      */
     private storageGetterForSyncedStorage;
-    startInitFromCache(user: string, keyGen: GenerateKey, makeNet: () => NetClient, resolver: ServiceLocator, logError: LogError): Promise<((getSigner: GetSigner) => Promise<boolean>) | undefined>;
-    initFromRemote(user: string, getSigner: GetSigner, keyOrGen: GenerateKey | Uint8Array, makeNet: () => NetClient, resolver: ServiceLocator, logError: LogError): Promise<boolean>;
+    startInitFromCache(user: string, keyGen: GenerateKey, makeNet: MakeNet, resolver: ServiceLocator, logError: LogError): Promise<((getSigner: GetSigner) => void) | undefined>;
+    initFromRemote(user: string, getSigner: GetSigner, generateKey: GenerateKey, makeNet: MakeNet, resolver: ServiceLocator, logError: LogError): Promise<boolean>;
+    initFreshForNewUser(user: string, getSigner: GetSigner, params: ScryptGenParams, key: Uint8Array, makeNet: MakeNet, resolver: ServiceLocator, logError: LogError): Promise<boolean>;
     makeSyncedFSForApp(appFolder: string): Promise<WritableFS>;
     makeLocalFSForApp(appFolder: string): Promise<WritableFS>;
     getUserFS(type: StorageType): Promise<FSItem>;
@@ -51,8 +41,6 @@ export declare class Storages implements FactoryOfFSs {
     close(): Promise<void>;
     wrap(): FactoryOfFSs;
 }
-export declare function userFilesOnDevice(): Promise<WritableFS>;
-export declare function sysFilesOnDevice(): Promise<FSItem>;
 export interface FactoryOfFSs {
     makeSyncedFSForApp(appFolder: string): Promise<WritableFS>;
     makeLocalFSForApp(appFolder: string): Promise<WritableFS>;