core-3nweb-client-lib 0.42.11 → 0.42.13

package/build/core/index.js

@@ -66,13 +66,7 @@ class Core {
             this.idManager = idManager;
             return this.idManager.getId();
         });
-        const coreAppsInit = coreInit.then(async () => {
-            // XXX This should be removed, at some point, as there will be no more
-            //     users with very old data folders.
-            await this.performDataMigrationsAtInit();
-            await this.initCoreApps(emitBootEvent);
-            this.isInitialized = true;
-        });
+        const coreAppsInit = coreInit.then(() => this.initCoreApps(emitBootEvent));
         return { coreInit, coreAppsInit, capsForStartup };
     }
     ;
@@ -81,9 +75,11 @@ class Core {
         const { watchBoot, emitBootEvent } = makeForBootEvents();
         const keyOpened = await this.initForExistingUserWithCache(userId, async () => storageKey, midDone, emitBootEvent);
         if (keyOpened) {
-            const coreInit = midPromise.then(idManager => {
+            const coreInit = midPromise
+                .then(idManager => {
                 this.idManager = idManager;
-            });
+            })
+                .then(() => this.initCoreApps(emitBootEvent));
             return { coreInit, watchBoot };
         }
     }
@@ -317,6 +313,9 @@ class Core {
     }
     async initCoreApps(emitBootEvent) {
         var _a;
+        // XXX This should be removed, at some point, as there will be no more
+        //     users with very old data folders.
+        await this.performDataMigrationsAtInit();
         try {
             const address = this.idManager.getId();
             const getSigner = this.idManager.getSigner;
@@ -336,6 +335,7 @@ class Core {
             throw (0, error_1.errWithCause)(err, 'Failed to initialize core apps');
         }
         emitBootEvent(true);
+        this.isInitialized = true;
     }
     getStorages() {
         return this.storages.wrap();

package/build/core/storage/index.js

@@ -279,7 +279,6 @@ class Storages {
         };
     }
     async getRootKey(user, pass, progressCB, cryptor) {
-        var _a;
         const storeKeyProgressCB = (0, sign_in_1.makeKeyGenProgressCB)(0, 99, progressCB);
         const storageDir = this.storageDirForUser(user);
         const params = await readRootKeyDerivParamsFromCache(storageDir);
@@ -287,7 +286,8 @@ class Storages {
             return;
         }
         const key = await (0, key_derivation_1.deriveStorageSKey)(cryptor, pass, params, storeKeyProgressCB);
-        return ((await ((_a = this.local) === null || _a === void 0 ? void 0 : _a.canKeyOpenRootObj(key))) ? key : undefined);
+        const indicatorStore = await StorageAndFS.existing(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, async () => { }), key);
+        return (indicatorStore ? key : undefined);
     }
     async startInitFromCache(user, keyGen, makeNet, resolver, logError) {
         const storageDir = this.storageDirForUser(user);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.42.11",
+  "version": "0.42.13",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",