core-3nweb-client-lib 0.42.8 → 0.42.10

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

@@ -60,7 +60,8 @@ class Delivery {
     }
     static async makeAndStart(fs, r) {
         const delivery = new Delivery(fs, r);
-        await delivery.restartDeliveryOfMsgsAtStartup();
+        delivery.restartDeliveryOfMsgsAtStartup()
+            .catch(err => delivery.r.logError(err));
         return delivery;
     }
     makeCAP() {

package/build/core/asmail/index.js

@@ -42,7 +42,8 @@ class ASMail {
     async init(address, getSigner, syncedFS, localFS, getStorages, makeResolver, config, keyring) {
         try {
             this.address = address;
-            await (0, fs_sync_utils_1.getRemoteFolderChanges)(syncedFS);
+            // XXX this should be part of proper syncing logic
+            // await getRemoteFolderChanges(syncedFS);
             this.config = config;
             this.keyring = keyring;
             await this.setupSendingParams(syncedFS);

package/build/core/asmail/sending-params/invitations-anon.js

@@ -31,8 +31,9 @@ class AnonymousInvites {
     static async makeAndInit(file, anonInvitesOnServer) {
         const anonInvites = new AnonymousInvites(anonInvitesOnServer);
         await anonInvites.fileProc.start(file, () => anonInvites.toFileJSON());
-        await anonInvites.absorbRemoteChanges();
-        await anonInvites.syncServiceSetting();
+        // XXX these are part of proper syncing logic
+        // await anonInvites.absorbRemoteChanges();
+        // await anonInvites.syncServiceSetting();
         return anonInvites;
     }
     async onFileEvent(ev) {

package/build/core/index.d.ts

@@ -4,6 +4,7 @@ import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
 type RequestedCAPs = web3n.caps.common.RequestedCAPs;
 type W3N = web3n.caps.common.W3N;
+type ProgressCB = web3n.startup.ProgressCB;
 export interface CoreConf {
     dataDir: string;
     signUpUrl: string;
@@ -29,6 +30,11 @@ export declare class Core {
         coreInit: Promise<string>;
         coreAppsInit: Promise<void>;
     };
+    startDirectlyFromCache(userId: string, storageKey: Uint8Array): Promise<{
+        watchBoot: (obs: web3n.startup.BootProcessObserver) => (() => void);
+        coreInit: Promise<void>;
+    } | undefined>;
+    getRootKey(user: string, pass: string, progressCB: ProgressCB): Promise<Uint8Array | undefined>;
     private initForNewUser;
     private initForExistingUserWithoutCache;
     private initForExistingUserWithCache;

package/build/core/index.js

@@ -76,6 +76,20 @@ class Core {
         return { coreInit, coreAppsInit, capsForStartup };
     }
     ;
+    async startDirectlyFromCache(userId, storageKey) {
+        const { promise: midPromise, resolve: midDone } = (0, deferred_1.defer)();
+        const { watchBoot, emitBootEvent } = makeForBootEvents();
+        const keyOpened = await this.initForExistingUserWithCache(userId, async () => storageKey, midDone, emitBootEvent);
+        if (keyOpened) {
+            const coreInit = midPromise.then(idManager => {
+                this.idManager = idManager;
+            });
+            return { coreInit, watchBoot };
+        }
+    }
+    getRootKey(user, pass, progressCB) {
+        return this.storages.getRootKey(user, pass, progressCB, this.cryptor.cryptor);
+    }
     async initForNewUser(u, done, emitBootEvent) {
         var _a;
         emitBootEvent({

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

@@ -7,9 +7,11 @@ import { AsyncSBoxCryptor } from 'xsp-files';
 import { StoragePathForUser } from '../app-files';
 import { LogError } from '../../lib-client/logging/log-to-file';
 import { MakeNet } from '..';
+import { Cryptor } from '../../cryptors';
 type WritableFS = web3n.files.WritableFS;
 type StorageType = web3n.storage.StorageType;
 type FSItem = web3n.files.FSItem;
+type ProgressCB = web3n.startup.ProgressCB;
 export declare class Storages implements FactoryOfFSs {
     private cryptor;
     private storageDirForUser;
@@ -31,6 +33,7 @@ export declare class Storages implements FactoryOfFSs {
      * This is a storage getter for links and linking in synced storage.
      */
     private storageGetterForSyncedStorage;
+    getRootKey(user: string, pass: string, progressCB: ProgressCB, cryptor: Cryptor): Promise<Uint8Array | undefined>;
     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>;

package/build/core/storage/index.js

@@ -18,9 +18,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Storages = void 0;
 exports.reverseDomain = reverseDomain;
+const sign_in_1 = require("../startup/sign-in");
 const fs_1 = require("../../lib-client/xsp-fs/fs");
 const storage_1 = require("./synced/storage");
 const storage_2 = require("./local/storage");
+const key_derivation_1 = require("../../lib-client/key-derivation");
 const file_1 = require("../../lib-common/exceptions/file");
 const fs_collection_1 = require("../../lib-client/fs-utils/fs-collection");
 const async_iter_1 = require("../../lib-common/async-iter");
@@ -131,6 +133,20 @@ class StorageAndFS {
         }
         return s;
     }
+    async canKeyOpenRootObj(key) {
+        try {
+            await fs_1.XspFS.fromExistingRoot(this.storage, key);
+            return true;
+        }
+        catch (err) {
+            if (err.failedCipherVerification) {
+                return false;
+            }
+            else {
+                throw err;
+            }
+        }
+    }
     /**
      * This creates app data folder.
      * Folder objects are uploaded, if this is a synced storage.
@@ -262,6 +278,17 @@ 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);
+        if (!params) {
+            return;
+        }
+        const key = await (0, key_derivation_1.deriveStorageSKey)(cryptor, pass, params, storeKeyProgressCB);
+        return (((_a = this.local) === null || _a === void 0 ? void 0 : _a.canKeyOpenRootObj(key)) ? key : undefined);
+    }
     async startInitFromCache(user, keyGen, makeNet, resolver, logError) {
         const storageDir = this.storageDirForUser(user);
         const params = await readRootKeyDerivParamsFromCache(storageDir);

package/package.json

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