core-3nweb-client-lib 0.49.0 → 0.49.2

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

@@ -154,6 +154,8 @@ class Delivery {
         }
         const attachments = common_1.Attachments.fromMsg(msgToSend);
         const localMeta = opts === null || opts === void 0 ? void 0 : opts.localMeta;
+        // DEBUG console to help capturing a bug
+        console.log(`Sending msg with delivery id ${id} ${attachments ? `with attachments` : `without attachments`}`);
         // save msg, in case delivery should be restarted
         const msgFS = await this.makeFSForNewMsg(id);
         const msg = await msg_1.Msg.forNew(id, msgFS, msgToSend, sender, recipients, this.r, attachments, localMeta, opts === null || opts === void 0 ? void 0 : opts.retryRecipient);

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

@@ -65,8 +65,7 @@ class WIP {
             const wip = new WIP(msg, state, cryptor);
             wip.packer = await msg.msgPacker(state.pack);
             if (state.bytesUploaded > 0) {
-                msg.progress.recipients[state.recipient].bytesSent =
-                    state.bytesUploaded;
+                msg.progress.recipients[state.recipient].bytesSent = state.bytesUploaded;
             }
             return wip;
         }
@@ -230,8 +229,7 @@ class WIP {
         const recInfo = this.msg.progress.recipients[recipient];
         if (complete) {
             if (err) {
-                recInfo.err = (err.runtimeException ?
-                    err : (err.stack ? err.stack : err));
+                recInfo.err = (err.runtimeException ? err : (err.stack ? err.stack : err));
             }
             else {
                 recInfo.bytesSent = this.msg.progress.msgSize;

package/build/core/startup/sign-in.d.ts

@@ -20,6 +20,7 @@ export declare class SignIn {
     constructor(cryptor: Cryptor, startInitWithoutCache: StartInitWithoutCache, initWithCache: InitWithCache, getUsersOnDisk: GetUsersOnDisk, saveStorageKeyForAutologin: ((storageKey: Uint8Array) => void) | undefined, watchBoot: SignInService['watchBoot'], logError: LogError);
     exposedService(): SignInService;
     private startLoginToRemoteStorage;
+    private getAddressFromDisk;
     private completeLoginAndLocalSetup;
     private useExistingStorage;
     private logAndWrap;

package/build/core/startup/sign-in.js

@@ -20,6 +20,7 @@ exports.SignIn = void 0;
 exports.makeKeyGenProgressCB = makeKeyGenProgressCB;
 const key_derivation_1 = require("../../lib-client/key-derivation");
 const error_1 = require("../../lib-common/exceptions/error");
+const canonical_address_1 = require("../../lib-common/canonical-address");
 class SignIn {
     constructor(cryptor, startInitWithoutCache, initWithCache, getUsersOnDisk, saveStorageKeyForAutologin, watchBoot, logError) {
         this.cryptor = cryptor;
@@ -44,6 +45,10 @@ class SignIn {
     }
     async startLoginToRemoteStorage(address) {
         try {
+            const addrOnDisk = await this.getAddressFromDisk(address);
+            if (addrOnDisk) {
+                throw new Error(`${address} exists on disk as ${addrOnDisk}`);
+            }
             this.completeInitWithoutCache = await this.startInitWithoutCache(address);
             return !!this.completeInitWithoutCache;
         }
@@ -51,6 +56,10 @@ class SignIn {
             throw await this.logAndWrap(err, 'Fail to start login to remote storage');
         }
     }
+    async getAddressFromDisk(address) {
+        const usersOnDisk = await this.getUsersOnDisk();
+        return usersOnDisk.find(existing => (0, canonical_address_1.areAddressesEqual)(existing, address));
+    }
     async completeLoginAndLocalSetup(pass, progressCB) {
         var _a;
         if (!this.completeInitWithoutCache) {
@@ -62,8 +71,10 @@ class SignIn {
             const storeKeyProgressCB = makeKeyGenProgressCB(51, 100, progressCB);
             let storeKey;
             const storeKeyGen = async (params) => {
-                storeKey = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
-                return storeKey;
+                const key = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
+                storeKey = new Uint8Array(key.length);
+                storeKey.set(key);
+                return key;
             };
             const ok = await this.completeInitWithoutCache(midKeyGen, storeKeyGen);
             if (ok) {
@@ -77,12 +88,18 @@ class SignIn {
     }
     async useExistingStorage(user, pass, progressCB) {
         var _a;
+        const addrOnDisk = await this.getAddressFromDisk(user);
+        if (addrOnDisk) {
+            user = addrOnDisk;
+        }
         try {
             let storeKey;
             const storeKeyProgressCB = makeKeyGenProgressCB(0, 99, progressCB);
             const storeKeyGen = async (params) => {
-                storeKey = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
-                return storeKey;
+                const key = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
+                storeKey = new Uint8Array(key.length);
+                storeKey.set(key);
+                return key;
             };
             const ok = await this.initWithCache(user, storeKeyGen);
             if (ok) {

package/build/core/startup/sign-up.js

@@ -164,7 +164,8 @@ class SignUp {
         if (!accountCreated) {
             return false;
         }
-        const storeKey = this.store.skey;
+        const storeKey = new Uint8Array(this.store.skey.length);
+        storeKey.set(this.store.skey);
         this.initForNewUser({
             address,
             midSKey: {

package/build/lib-client/asmail/sender.js

@@ -155,9 +155,9 @@ class MailSender {
         }
     }
     prepareRedirectOrThrowUp(rep) {
-        if (("string" !== typeof rep.redirect) ||
-            (rep.redirect.length === 0) ||
-            ((new URL(rep.redirect)).protocol !== 'https:')) {
+        if (("string" !== typeof rep.redirect)
+            || (rep.redirect.length === 0)
+            || ((new URL(rep.redirect)).protocol !== 'https:')) {
             throw this.badRedirectExc();
         }
         // refuse second redirect
@@ -413,8 +413,8 @@ class MailSender {
     async trySessionRestart() {
         // check and set timestamp for session restarts
         const now = Date.now();
-        if ((typeof this.sessionRestartTimeStamp === 'number') &&
-            (now <= (this.sessionRestartTimeStamp + TOO_EARLY_RESTART_PERIOD))) {
+        if ((typeof this.sessionRestartTimeStamp === 'number')
+            && (now <= (this.sessionRestartTimeStamp + TOO_EARLY_RESTART_PERIOD))) {
             return false;
         }
         this.sessionRestartTimeStamp = now;
@@ -451,6 +451,10 @@ class MailSender {
             }
         }
         else if (rep.status === api.msgObj.SC.ok) {
+            // DEBUG console to help capturing a bug
+            if ((fstReq === null || fstReq === void 0 ? void 0 : fstReq.last) || (followReq === null || followReq === void 0 ? void 0 : followReq.last)) {
+                console.log(`sent obj ${objId} within msg ${this.msgId}`);
+            }
             // normal return
             return;
         }

package/package.json

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