core-3nweb-client-lib 0.27.3 → 0.27.5

package/build/core/asmail/inbox/msg-on-disk.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.MsgOnDisk = void 0;
 const fs = require("../../../lib-common/async-fs-node");

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

@@ -10,6 +10,7 @@ declare type Service = web3n.asmail.Service;
 export declare type MailCAPMaker = () => Service;
 export declare class ASMail {
     private readonly cryptor;
+    private readonly makeNet;
     private readonly inboxPathForUser;
     private readonly logger;
     private keyring;
@@ -18,7 +19,6 @@ export declare class ASMail {
     private delivery;
     private config;
     private sendingParams;
-    private readonly makeNet;
     constructor(cryptor: AsyncSBoxCryptor, makeNet: MakeNet, inboxPathForUser: InboxPathForUser, logger: Logger);
     init(address: string, getSigner: GetSigner, syncedFS: WritableFS, localFS: WritableFS, getStorages: StorageGetter, makeResolver: ServiceLocatorMaker): Promise<void>;
     private setupConfig;

package/build/core/asmail/index.js

@@ -32,6 +32,7 @@ const SEND_PARAMS_DATA_FOLDER = 'sending-params';
 class ASMail {
     constructor(cryptor, makeNet, inboxPathForUser, logger) {
         this.cryptor = cryptor;
+        this.makeNet = makeNet;
         this.inboxPathForUser = inboxPathForUser;
         this.logger = logger;
         this.keyring = undefined;
@@ -40,7 +41,6 @@ class ASMail {
         this.delivery = undefined;
         this.config = undefined;
         this.sendingParams = undefined;
-        this.makeNet = () => makeNet();
         Object.seal(this);
     }
     async init(address, getSigner, syncedFS, localFS, getStorages, makeResolver) {
@@ -70,7 +70,7 @@ class ASMail {
     }
     async setupKeyring(syncedFS) {
         const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, KEYRING_DATA_FOLDER);
-        this.keyring = await keyring_1.KeyRing.makeAndStart(this.cryptor, fs, this.config.publishedKeys);
+        this.keyring = await (0, keyring_1.makeAndKeyRing)(this.cryptor, fs, this.config.publishedKeys);
     }
     async setupSendingParams(syncedFS) {
         const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, SEND_PARAMS_DATA_FOLDER);
@@ -99,8 +99,8 @@ class ASMail {
     }
     async setupInbox(syncedFS, getSigner, getStorages, makeResolver) {
         const cachePath = this.inboxPathForUser(this.address);
-        const inboxFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, INBOX_DATA_FOLDER);
-        this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxFS, {
+        const inboxSyncedFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, INBOX_DATA_FOLDER);
+        this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxSyncedFS, {
             address: this.address,
             cryptor: this.cryptor,
             getSigner,
@@ -126,6 +126,7 @@ class ASMail {
     }
     ;
     async close() {
+        await this.inbox.close();
         await this.keyring.close();
     }
 }

package/build/core/asmail/keyring/correspondent-keys.d.ts

@@ -4,7 +4,7 @@
 import { JWKeyPair, MsgKeyRole, ASMailKeyPair } from './common';
 import { JsonKey, JsonKeyShort } from '../../../lib-common/jwkeys';
 import { SuggestedNextKeyPair } from '../msg/opener';
-import { KeyRing } from './index';
+import { KeyPairsStorage } from './index';
 import { Decryptor } from '../../../lib-common/async-cryptor-wrap';
 import { AsyncSBoxCryptor } from 'xsp-files';
 export interface ReceptionPair {
@@ -89,7 +89,7 @@ export declare class CorrespondentKeys {
      * @param serialData from which this object should be reconstructed.
      * Either serialData, or an address should be defined, not both.
      */
-    constructor(keyring: KeyRing, address: string | undefined, serialData?: string);
+    constructor(keyring: KeyPairsStorage, address: string | undefined, serialData?: string);
     /**
      * This attaches all keys into ring's maps.
      * Theis method should be called only once, and only on a deserialized

package/build/core/asmail/keyring/correspondent-keys.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2022 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
@@ -26,6 +26,7 @@ const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const error_1 = require("../../../lib-common/exceptions/error");
 const async_cryptor_wrap_1 = require("../../../lib-common/async-cryptor-wrap");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 function generatePids() {
     const pids = [];
     for (let i = 0; i < 5; i += 1) {
@@ -35,7 +36,8 @@ function generatePids() {
 }
 function msgMasterDecryptor(cryptor, skey, pkey) {
     const msgMasterKey = calcMsgMasterKey(skey, pkey);
-    const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(cryptor, msgMasterKey);
+    const workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeRandom('asmail');
+    const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(cryptor, workLabel, msgMasterKey);
     msgMasterKey.fill(0);
     return masterDecr;
 }

package/build/core/asmail/keyring/index.d.ts

@@ -7,10 +7,7 @@ import { ResourcesForReceiving } from '../inbox';
 export { KEY_USE, MsgKeyRole } from './common';
 export interface MsgKeyInfo {
     correspondent: string;
-    /**
-     * This is a base64 form of key's byte array.
-     */
-    key?: string;
+    key?: Uint8Array;
     /**
      * This is a current status of the key in this keyring.
      */
@@ -25,35 +22,15 @@ export interface MsgKeyInfo {
 declare type WritableFS = web3n.files.WritableFS;
 declare type SendingResources = ResourcesForSending['correspondents'];
 declare type ReceptionResources = ResourcesForReceiving['correspondents'];
-export declare class KeyRing {
-    private readonly cryptor;
-    private readonly publishedKeys;
-    /**
-     * This is a map from correspondents' canonical addresses to key objects.
-     */
-    private readonly corrKeys;
-    readonly pairIdToEmailMap: IdToEmailMap;
-    private storage;
-    constructor(cryptor: AsyncSBoxCryptor, publishedKeys: ConfigOfASMailServer['publishedKeys']);
-    private addCorrespondent;
-    private init;
-    static makeAndStart(cryptor: AsyncSBoxCryptor, fs: WritableFS, publishedKeys: ConfigOfASMailServer['publishedKeys']): Promise<KeyRing>;
-    saveChanges(): void;
+export interface KeyRing {
     needIntroKeyFor: SendingResources['needIntroKeyFor'];
-    readonly generateKeysToSend: SendingResources['generateKeysToSend'];
-    readonly nextCrypto: SendingResources['nextCrypto'];
-    private decryptMsgKeyWithIntroPair;
-    private findEstablishedReceptionPairs;
-    private decryptMsgKeyWithEstablishedPair;
-    /**
-     * This method updates message counts and a timestamp in a given reception
-     * pair.
-     * @param rp is a sending pair, in which changes should be done. Note this
-     * must be a shared structure at this point, not a copy of a pair.
-     * @param msgCount is a message count that should be added to the pair.
-     */
-    private updateReceivedMsgCountIn;
-    private absorbSuggestedNextKeyPair;
-    readonly decrypt: ReceptionResources['msgDecryptor'];
+    generateKeysToSend: SendingResources['generateKeysToSend'];
+    nextCrypto: SendingResources['nextCrypto'];
+    decrypt: ReceptionResources['msgDecryptor'];
     close(): Promise<void>;
 }
+export declare function makeAndKeyRing(cryptor: AsyncSBoxCryptor, fs: WritableFS, publishedKeys: ConfigOfASMailServer['publishedKeys']): Promise<KeyRing>;
+export interface KeyPairsStorage {
+    pairIdToEmailMap: IdToEmailMap;
+    saveChanges: () => void;
+}

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2022 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
@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyRing = exports.KEY_USE = void 0;
+exports.makeAndKeyRing = 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");
@@ -27,9 +27,15 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../../lib-common/canonical-address");
 const common_2 = require("../delivery/common");
 const keyring_storage_1 = require("./keyring-storage");
+const assert_1 = require("../../../lib-common/assert");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 var common_3 = require("./common");
 Object.defineProperty(exports, "KEY_USE", { enumerable: true, get: function () { return common_3.KEY_USE; } });
-class KeyRing {
+function makeAndKeyRing(cryptor, fs, publishedKeys) {
+    return KRing.makeAndStart(cryptor, fs, publishedKeys);
+}
+exports.makeAndKeyRing = makeAndKeyRing;
+class KRing {
     constructor(cryptor, publishedKeys) {
         this.cryptor = cryptor;
         this.publishedKeys = publishedKeys;
@@ -38,8 +44,13 @@ class KeyRing {
          */
         this.corrKeys = new Map();
         this.pairIdToEmailMap = new id_to_email_map_1.IdToEmailMap();
+        this.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeRandom('asmail');
         this.storage = undefined;
-        this.needIntroKeyFor = (address) => {
+        this.asKeyPairsStorage = {
+            pairIdToEmailMap: this.pairIdToEmailMap,
+            saveChanges: this.saveChanges.bind(this)
+        };
+        this.needIntroKeyFor = address => {
             address = (0, canonical_address_1.toCanonicalAddress)(address);
             return !this.corrKeys.has(address);
         };
@@ -55,7 +66,7 @@ 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 = (0, async_cryptor_wrap_1.makeEncryptor)(this.cryptor, msgMasterKey, nextNonce);
+            const encryptor = (0, async_cryptor_wrap_1.makeEncryptor)(this.cryptor, this.workLabel, msgMasterKey, nextNonce);
             msgMasterKey.fill(0);
             return { encryptor, currentPair, msgCount };
         };
@@ -68,65 +79,14 @@ class KeyRing {
             const suggestPair = await ck.suggestPair();
             return suggestPair;
         };
-        this.decrypt = async (msgMeta, getMainObjHeader, getOpenedMsg, checkMidKeyCerts) => {
-            let decrInfo;
-            let incrMsgCount;
-            let openedMsg;
-            if (msgMeta.pid) {
-                const r = await this.decryptMsgKeyWithEstablishedPair(msgMeta.pid, getMainObjHeader);
-                if (!r) {
-                    return;
-                }
-                decrInfo = r.keyInfo;
-                incrMsgCount = r.incrMsgCount;
-                openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
-            }
-            else {
-                decrInfo = await this.decryptMsgKeyWithIntroPair(msgMeta.recipientKid, msgMeta.senderPKey, getMainObjHeader);
-                if (!decrInfo) {
-                    return;
-                }
-                openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
-                const certs = openedMsg.introCryptoCerts;
-                const { address, pkey } = await checkMidKeyCerts(certs);
-                if (pkey.k !== msgMeta.senderPKey) {
-                    throw new Error(`Key certificates in the message are not for a key that encrypted this message.`);
-                }
-                decrInfo.correspondent = (0, canonical_address_1.toCanonicalAddress)(address);
-            }
-            // check that sender is the same as the trusted correspondent
-            const sender = openedMsg.sender;
-            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
-            if (incrMsgCount) {
-                incrMsgCount(openedMsg.msgCount);
-            }
-            // absorb next crypto
-            const pair = openedMsg.nextCrypto;
-            if (pair) {
-                if (msgMeta.recipientKid) {
-                    if (!pair.isSenderIntroKey) {
-                        throw new Error(`Introductory message is not referencing used intro key in the next crypto`);
-                    }
-                    if (msgMeta.recipientKid !== pair.senderKid) {
-                        throw new Error(`Introductory message is referencing wrong key in the next crypto`);
-                    }
-                }
-                this.absorbSuggestedNextKeyPair(decrInfo.correspondent, pair);
-            }
-            return { decrInfo, openedMsg };
-        };
         Object.seal(this);
     }
     addCorrespondent(address, serialForm) {
         const ck = (serialForm ?
-            new correspondent_keys_1.CorrespondentKeys(this, undefined, serialForm) :
-            new correspondent_keys_1.CorrespondentKeys(this, address));
+            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, undefined, serialForm) :
+            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, address));
         if (this.corrKeys.has(ck.correspondent)) {
-            throw new Error("Correspondent with address " + ck.correspondent +
-                " is already present.");
+            throw new Error(`Correspondent with address ${ck.correspondent} is already present.`);
         }
         this.corrKeys.set(ck.correspondent, ck);
         if (serialForm) {
@@ -135,9 +95,7 @@ class KeyRing {
         return ck;
     }
     async init(fs) {
-        if (this.storage) {
-            throw new Error("Keyring has already been initialized.");
-        }
+        (0, assert_1.assert)(!this.storage);
         this.storage = (0, keyring_storage_1.makeKeyringStorage)(fs);
         await this.storage.start();
         const serialForm = await this.storage.load();
@@ -155,9 +113,15 @@ class KeyRing {
         }
     }
     static async makeAndStart(cryptor, fs, publishedKeys) {
-        const kr = new KeyRing(cryptor, publishedKeys);
+        const kr = new KRing(cryptor, publishedKeys);
         await kr.init(fs);
-        return kr;
+        return {
+            close: kr.close.bind(kr),
+            decrypt: kr.decrypt.bind(kr),
+            generateKeysToSend: kr.generateKeysToSend.bind(kr),
+            needIntroKeyFor: kr.needIntroKeyFor.bind(kr),
+            nextCrypto: kr.nextCrypto.bind(kr)
+        };
     }
     saveChanges() {
         // pack bytes that need to be encrypted and saved
@@ -186,10 +150,9 @@ class KeyRing {
             const info = {
                 correspondent: undefined,
                 keyStatus: recipKey.role,
-                key: buffer_utils_1.base64.pack(mainObjFileKey),
+                key: mainObjFileKey,
                 msgKeyPackLen
             };
-            mainObjFileKey.fill(0);
             return info;
         }
         catch (err) {
@@ -233,7 +196,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 = (0, async_cryptor_wrap_1.makeDecryptor)(this.cryptor, masterKey);
+            const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(this.cryptor, this.workLabel, masterKey);
             masterKey.fill(0);
             try {
                 const msgKeyPackLen = msgKeyPackLenForPair(pair);
@@ -244,18 +207,18 @@ class KeyRing {
                 const keyInfo = {
                     correspondent: correspondent,
                     keyStatus: role,
-                    key: buffer_utils_1.base64.pack(mainObjFileKey),
+                    key: mainObjFileKey,
                     msgKeyPackLen
                 };
-                mainObjFileKey.fill(0);
                 // set pair as in use
                 if (keyInfo.keyStatus === 'suggested') {
                     const corrKeys = this.corrKeys.get(keyInfo.correspondent);
                     corrKeys.markPairAsInUse(pair);
                 }
-                // prepare msg count incrementor that will be "called back"
-                const incrMsgCount = (msgCount) => this.updateReceivedMsgCountIn(pair, msgCount);
-                return { keyInfo, incrMsgCount };
+                return {
+                    keyInfo,
+                    incrMsgCount: msgCount => this.updateReceivedMsgCountIn(pair, msgCount)
+                };
             }
             catch (err) {
                 if (!err.failedCipherVerification) {
@@ -301,13 +264,63 @@ class KeyRing {
         }
         this.saveChanges();
     }
+    async decrypt(msgMeta, getMainObjHeader, getOpenedMsg, checkMidKeyCerts) {
+        let decrInfo;
+        let incrMsgCount;
+        let openedMsg;
+        if (msgMeta.pid) {
+            const r = await this.decryptMsgKeyWithEstablishedPair(msgMeta.pid, getMainObjHeader);
+            if (!r) {
+                return;
+            }
+            decrInfo = r.keyInfo;
+            incrMsgCount = r.incrMsgCount;
+            openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
+        }
+        else {
+            decrInfo = await this.decryptMsgKeyWithIntroPair(msgMeta.recipientKid, msgMeta.senderPKey, getMainObjHeader);
+            if (!decrInfo) {
+                return;
+            }
+            openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
+            const certs = openedMsg.introCryptoCerts;
+            const { address, pkey } = await checkMidKeyCerts(certs);
+            if (pkey.k !== msgMeta.senderPKey) {
+                throw new Error(`Key certificates in the message are not for a key that encrypted this message.`);
+            }
+            decrInfo.correspondent = (0, canonical_address_1.toCanonicalAddress)(address);
+        }
+        // check that sender is the same as the trusted correspondent
+        const sender = openedMsg.sender;
+        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
+        if (incrMsgCount) {
+            incrMsgCount(openedMsg.msgCount);
+        }
+        // absorb next crypto
+        const pair = openedMsg.nextCrypto;
+        if (pair) {
+            if (msgMeta.recipientKid) {
+                if (!pair.isSenderIntroKey) {
+                    throw new Error(`Introductory message is not referencing used intro key in the next crypto`);
+                }
+                if (msgMeta.recipientKid !== pair.senderKid) {
+                    throw new Error(`Introductory message is referencing wrong key in the next crypto`);
+                }
+            }
+            this.absorbSuggestedNextKeyPair(decrInfo.correspondent, pair);
+        }
+        return { decrInfo, openedMsg };
+    }
+    ;
     close() {
         return this.storage.close();
     }
 }
-exports.KeyRing = KeyRing;
-Object.freeze(KeyRing.prototype);
-Object.freeze(KeyRing);
+Object.freeze(KRing.prototype);
+Object.freeze(KRing);
 function msgKeyPackLenForPair(p) {
     return (0, common_1.msgKeyPackSizeFor)(p.recipientKey.skey.alg);
 }

package/build/core/asmail/msg/opener.js

@@ -20,6 +20,7 @@ exports.openMsg = exports.OpenedMsg = void 0;
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const error_1 = require("../../../lib-common/exceptions/error");
 const xsp_files_1 = require("xsp-files");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 class OpenedMsg {
     constructor(msgId, main) {
         this.msgId = msgId;
@@ -77,9 +78,9 @@ Object.freeze(OpenedMsg);
 async function openMsg(msgId, mainObjId, mainObj, headerOfs, fKey, cryptor) {
     try {
         const header = await mainObj.readHeader();
-        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);
+        const segReader = await (0, xsp_files_1.makeSegmentsReader)(fKey, (0, xsp_files_1.idToHeaderNonce)(mainObjId), 0, header.subarray(headerOfs), cryptor, cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', msgId));
+        const byteSrc = (0, xsp_files_1.makeDecryptedByteSource)(mainObj.segSrc, segReader);
+        const bytes = await byteSrc.readNext(undefined);
         if (!bytes) {
             throw new Error(`End of bytes is reached too soon`);
         }

package/build/core/asmail/msg/packer.d.ts

@@ -52,6 +52,7 @@ export declare class MsgPacker {
     private hasAttachments;
     private attachmentsFS;
     private attachmentsCont;
+    private workLabel;
     private constructor();
     static empty(segSizeIn256bs: number): MsgPacker;
     static fromPack(p: PackJSON, segSizeIn256bs: number, att: undefined | {

package/build/core/asmail/msg/packer.js

@@ -24,6 +24,7 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const folder_node_serialization_1 = require("../../../lib-client/3nstorage/xsp-fs/folder-node-serialization");
 const json_utils_1 = require("../../../lib-common/json-utils");
 const attachments_container_1 = require("./attachments-container");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 function turnKeysToB64(obj) {
     obj.key = buffer_utils_1.base64.pack(obj.key);
     if (!obj.folder) {
@@ -88,6 +89,7 @@ class MsgPacker {
             'From': undefined
         };
         this.mainObjId = this.addJsonObj(this.main);
+        this.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', this.mainObjId);
         Object.seal(this);
     }
     static empty(segSizeIn256bs) {
@@ -97,6 +99,7 @@ class MsgPacker {
         const packer = new MsgPacker(segSizeIn256bs);
         packer.readyPack = p;
         packer.mainObjId = p.meta.objIds[0];
+        packer.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', packer.mainObjId);
         Object.values((0, json_utils_1.copy)(p.objs))
             .forEach(obj => {
             packer.allObjs.set(obj.id, obj);
@@ -347,7 +350,7 @@ class MsgPacker {
         }
         const msgKeyPack = await msgKeyEnc.pack(obj.key);
         const bytes = buffer_utils_1.utf8.pack(JSON.stringify(obj.json));
-        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);
+        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, this.workLabel);
         // make source that inserts message key pack into header
         return makeMainObjSrc(msgKeyPack, bytes, segWriter);
     }
@@ -410,10 +413,10 @@ class MsgPacker {
         // make object segments writer
         let segWriter;
         if (header) {
-            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, 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, this.workLabel);
         }
         else {
-            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);
+            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, this.workLabel);
         }
         // make object source
         let src;
@@ -492,7 +495,8 @@ function fileSrcToByteSrc(fileSrc) {
                 size: await fileSrc.getSize()
             };
         },
-        read: fileSrc.read,
+        readNext: fileSrc.readNext,
+        readAt: fileSrc.readAt,
         seek: fileSrc.seek
     };
 }

package/build/core/index.js

@@ -120,9 +120,8 @@ class Core {
         const initFromSignUp$ = signUp.newUser$
             .pipe((0, operators_1.mergeMap)(this.initForNewUser, 1));
         const initFromSignIn$ = signIn.existingUser$;
-        const coreInit = (0, rxjs_1.merge)(initFromSignIn$, initFromSignUp$)
-            .pipe((0, operators_1.take)(1), (0, operators_1.mergeMap)(idManager => this.initCore(idManager), 1))
-            .toPromise();
+        const coreInit = (0, rxjs_1.lastValueFrom)((0, rxjs_1.merge)(initFromSignIn$, initFromSignUp$)
+            .pipe((0, operators_1.take)(1), (0, operators_1.mergeMap)(idManager => this.initCore(idManager), 1)));
         return { coreInit, capsForStartup };
     }
     ;
@@ -225,8 +224,7 @@ function makeStoragePolicy(appDomain, requestedCAPs) {
     }
     else if (Array.isArray(capReq.appFS)) {
         const okDomains = capReq.appFS
-            .filter(fsInfo => (fsInfo.domain === appDomain) ||
-            fsInfo.domain.endsWith('.' + appDomain))
+            .filter(fsInfo => (fsInfo.domain === appDomain) || fsInfo.domain.endsWith('.' + appDomain))
             .map(fsInfo => (0, json_utils_1.copy)(fsInfo));
         policy = {
             canOpenAppFS: severalDomainsAppFSChecker(okDomains)

package/build/core/sign-in.js

@@ -45,7 +45,7 @@ class SignIn {
                 const midKeyProgressCB = makeKeyGenProgressCB(0, 50, progressCB);
                 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) => (0, 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;

package/build/core/storage/local/obj-files.js

@@ -24,6 +24,7 @@ const path_1 = require("path");
 const obj_files_gc_1 = require("./obj-files-gc");
 const obj_status_1 = require("./obj-status");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
+const rxjs_1 = require("rxjs");
 class ObjFiles {
     constructor(folders, logError) {
         this.folders = folders;
@@ -140,7 +141,7 @@ class LocalObj {
         const fPath = this.path(version);
         const { obj, write$ } = await obj_on_disk_1.ObjOnDisk.createFileForWriteOfNewVersion(this.objId, version, fPath, encSub, undefined, this.objSegsGetterFromDisk);
         try {
-            await write$.toPromise();
+            await (0, rxjs_1.lastValueFrom)(write$);
         }
         catch (err) {
             if (this.verObjs.get(version) === obj) {

package/build/core/storage/synced/obj-files.d.ts

@@ -89,4 +89,6 @@ export declare class SyncedObj {
     syncStatus(): SyncedObjStatus;
     statusObj(): ObjStatus;
     recordRemovalUploadAndGC(): Promise<void>;
+    isRemoteVersionOnDisk(version: number): Promise<'complete' | 'partial' | 'none'>;
+    downloadRemoteVersion(version: number): Promise<void>;
 }

package/build/core/storage/synced/obj-files.js

@@ -32,6 +32,7 @@ const obj_status_1 = require("./obj-status");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 const upload_header_file_1 = require("./upload-header-file");
 const utils_1 = require("../common/utils");
+const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
 exports.UNSYNCED_FILE_NAME_EXT = 'unsynced';
 exports.REMOTE_FILE_NAME_EXT = 'v';
 /**
@@ -338,7 +339,8 @@ class SyncedObj {
             this.remoteVers.set(uploadVersion, syncedVerObj);
         }
         else {
-            await fs.rename(this.localVerPath(localVersion), remotePath);
+            const localPath = this.localVerPath(localVersion);
+            await fs.rename(localPath, remotePath);
         }
         await this.status.recordUploadCompletion(localVersion, uploadVersion);
         this.scheduleSelfGC();
@@ -395,6 +397,21 @@ class SyncedObj {
         await this.status.recordRemoteRemovalCompletion();
         this.scheduleSelfGC();
     }
+    async isRemoteVersionOnDisk(version) {
+        if (!this.status.isAmongRemote(version)) {
+            throw (0, exceptions_1.makeObjVersionNotFoundExc)(this.objId, version);
+        }
+        const verPath = this.remoteVerPath(version);
+        if (!(await isOnDisk(verPath))) {
+            return 'none';
+        }
+        const objVer = await this.instanceOfRemoteObjVer(version);
+        return (objVer.doesFileNeedDownload() ? 'complete' : 'partial');
+    }
+    async downloadRemoteVersion(version) {
+        const objVer = await this.instanceOfRemoteObjVer(version);
+        await objVer.downloadMissingSections();
+    }
 }
 exports.SyncedObj = SyncedObj;
 Object.freeze(SyncedObj.prototype);

package/build/core/storage/synced/obj-status.d.ts

@@ -125,6 +125,7 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     neverUploaded(): boolean;
     versionBeforeUnsyncedRemoval(): number | undefined;
     adoptRemoteVersion(version?: number, dropLocalVer?: boolean): Promise<void>;
+    isAmongRemote(version: number): boolean;
 }
 export declare function readAndCheckStatus(objFolder: string, objId: ObjId): Promise<ObjStatusInfo>;
 export {};

package/build/core/storage/synced/obj-status.js

@@ -551,6 +551,16 @@ class ObjStatus {
         this.updateStateIndicator();
         await this.triggerSaveProc();
     }
+    isAmongRemote(version) {
+        var _a;
+        if (this.status.remote.current === version) {
+            return true;
+        }
+        if ((_a = this.status.remote.archived) === null || _a === void 0 ? void 0 : _a.includes(version)) {
+            return true;
+        }
+        return false;
+    }
 }
 exports.ObjStatus = ObjStatus;
 Object.freeze(ObjStatus.prototype);