core-3nweb-client-lib 0.47.3 → 0.48.0

package/build/core/asmail/delivery/common.d.ts

@@ -6,6 +6,7 @@ import { ASMailKeyPair } from '../../keyring/common';
 import { NetClient } from '../../../lib-client/request-utils';
 import { LogWarning, LogError } from '../../../lib-client/logging/log-to-file';
 import { ServiceLocator } from '../../../lib-client/service-locator';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 type OutgoingMessage = web3n.asmail.OutgoingMessage;
 type DeliveryProgress = web3n.asmail.DeliveryProgress;
 type DeliveryOptions = web3n.asmail.DeliveryOptions;
@@ -77,6 +78,7 @@ export interface ResourcesForSending {
         newParamsForSendingReplies: (address: string) => Promise<SendingParams | undefined>;
     };
     cryptor: AsyncSBoxCryptor;
+    random: AsyncRNG;
     notifyMsgProgress: (id: string, progress: DeliveryProgress) => void;
     logError: LogError;
     logWarning: LogWarning;

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

@@ -171,9 +171,9 @@ class Msg {
     }
     async msgPacker(pack) {
         if (pack) {
-            return packer_1.MsgPacker.fromPack(pack, common_1.SEG_SIZE_IN_K_QUATS, this.attachments);
+            return packer_1.MsgPacker.fromPack(pack, common_1.SEG_SIZE_IN_K_QUATS, this.attachments, this.r.random);
         }
-        const msg = packer_1.MsgPacker.empty(common_1.SEG_SIZE_IN_K_QUATS);
+        const msg = await packer_1.MsgPacker.empty(common_1.SEG_SIZE_IN_K_QUATS, this.r.random);
         msg.setSection('From', this.sender);
         if (typeof this.msgToSend.plainTxtBody === 'string') {
             msg.setPlainTextBody(this.msgToSend.plainTxtBody);

package/build/core/asmail/inbox/attachments/fs.d.ts

@@ -2,6 +2,7 @@ import { StorageGetter, FolderInJSON } from '../../../../lib-client/xsp-fs/commo
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { MsgOnDisk } from '../msg-on-disk';
 import { LogError } from '../../../../lib-client/logging/log-to-file';
+import { AsyncRNG } from '../../../../lib-common/rng-def';
 type ReadonlyFS = web3n.files.ReadonlyFS;
-export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInJSON, storages: StorageGetter, cryptor: AsyncSBoxCryptor, logError: LogError): ReadonlyFS;
+export declare function fsForAttachments(msg: MsgOnDisk, rootJson: FolderInJSON, storages: StorageGetter, cryptor: AsyncSBoxCryptor, random: AsyncRNG, logError: LogError): ReadonlyFS;
 export {};

package/build/core/asmail/inbox/attachments/fs.js

@@ -20,10 +20,11 @@ exports.fsForAttachments = fsForAttachments;
 const common_1 = require("../../../../lib-client/xsp-fs/common");
 const fs_1 = require("../../../../lib-client/xsp-fs/fs");
 class AttachmentStore {
-    constructor(msg, getStorages, cryptor, logError) {
+    constructor(msg, getStorages, cryptor, random, logError) {
         this.msg = msg;
         this.getStorages = getStorages;
         this.cryptor = cryptor;
+        this.random = random;
         this.logError = logError;
         this.type = 'asmail-msg';
         this.versioned = false;
@@ -67,8 +68,8 @@ class AttachmentStore {
 }
 Object.freeze(AttachmentStore.prototype);
 Object.freeze(AttachmentStore);
-function fsForAttachments(msg, rootJson, storages, cryptor, logError) {
-    const storage = new AttachmentStore(msg, storages, cryptor, logError);
+function fsForAttachments(msg, rootJson, storages, cryptor, random, logError) {
+    const storage = new AttachmentStore(msg, storages, cryptor, random, logError);
     const fs = fs_1.XspFS.fromASMailMsgRootFromJSON(storage, rootJson, 'attachments');
     return fs;
 }

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

@@ -8,6 +8,7 @@ import { LogError } from '../../../lib-client/logging/log-to-file';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { SendingParams } from '../msg/common';
 import { NetClient } from '../../../lib-client/request-utils';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 type WritableFS = web3n.files.WritableFS;
 type InboxService = web3n.asmail.InboxService;
 type JsonKey = web3n.keys.JsonKey;
@@ -17,6 +18,7 @@ export interface ResourcesForReceiving {
     getSigner: GetSigner;
     getStorages: StorageGetter;
     cryptor: AsyncSBoxCryptor;
+    random: AsyncRNG;
     makeNet: () => NetClient;
     asmailResolver: ServiceLocator;
     correspondents: {
@@ -75,6 +77,7 @@ export declare class InboxOnServer {
     private readonly msgReceiver;
     private readonly storages;
     private readonly cryptor;
+    private readonly random;
     private readonly downloader;
     private readonly cache;
     private readonly index;

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

@@ -40,11 +40,12 @@ const MSG_INDEX_FOLDER = 'msg-index';
  * This object is also responsible for expiring messages on the server.
  */
 class InboxOnServer {
-    constructor(r, msgReceiver, storages, cryptor, downloader, cache, index, logError) {
+    constructor(r, msgReceiver, storages, cryptor, random, downloader, cache, index, logError) {
         this.r = r;
         this.msgReceiver = msgReceiver;
         this.storages = storages;
         this.cryptor = cryptor;
+        this.random = random;
         this.downloader = downloader;
         this.cache = cache;
         this.index = index;
@@ -63,7 +64,7 @@ class InboxOnServer {
             const indexSyncedFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, MSG_INDEX_FOLDER);
             const index = await msg_indexing_1.MsgIndex.make(indexSyncedFS);
             await (0, fs_sync_utils_1.uploadFolderChangesIfAny)(syncedFS);
-            const inbox = new InboxOnServer(r.correspondents, msgReceiver, r.getStorages, r.cryptor, downloader, cache, index, r.logError);
+            const inbox = new InboxOnServer(r.correspondents, msgReceiver, r.getStorages, r.cryptor, r.random, downloader, cache, index, r.logError);
             return inbox;
         }
         catch (err) {
@@ -324,7 +325,7 @@ class InboxOnServer {
         }
         const attachments = msg.attachmentsJSON;
         if (attachments) {
-            m.attachments = (0, fs_1.fsForAttachments)(msgOnDisk, attachments, this.storages, this.cryptor, this.logError);
+            m.attachments = (0, fs_1.fsForAttachments)(msgOnDisk, attachments, this.storages, this.cryptor, this.random, this.logError);
         }
         return m;
     }

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

@@ -7,11 +7,13 @@ import { AsyncSBoxCryptor } from 'xsp-files';
 import { Logger } from '../../lib-client/logging/log-to-file';
 import { ServiceLocatorMaker } from '../../lib-client/service-locator';
 import { MakeNet } from '..';
+import { AsyncRNG } from '../../lib-common/rng-def';
 type WritableFS = web3n.files.WritableFS;
 type Service = web3n.asmail.Service;
 export type MailCAPMaker = () => Service;
 export declare class ASMail {
     private readonly cryptor;
+    private readonly random;
     private readonly makeNet;
     private readonly inboxPathForUser;
     private readonly logger;
@@ -21,7 +23,7 @@ export declare class ASMail {
     private delivery;
     private config;
     private sendingParams;
-    constructor(cryptor: AsyncSBoxCryptor, makeNet: MakeNet, inboxPathForUser: InboxPathForUser, logger: Logger);
+    constructor(cryptor: AsyncSBoxCryptor, random: AsyncRNG, makeNet: MakeNet, inboxPathForUser: InboxPathForUser, logger: Logger);
     init(address: string, getSigner: GetSigner, syncedFS: WritableFS, localFS: WritableFS, getStorages: StorageGetter, makeResolver: ServiceLocatorMaker, config: ConfigOfASMailServer, keyring: KeyringForASMail): Promise<void>;
     private setupSendingParams;
     private setupDelivery;

package/build/core/asmail/index.js

@@ -26,8 +26,9 @@ const INBOX_DATA_FOLDER = 'inbox';
 const DELIVERY_DATA_FOLDER = 'delivery';
 const SEND_PARAMS_DATA_FOLDER = 'sending-params';
 class ASMail {
-    constructor(cryptor, makeNet, inboxPathForUser, logger) {
+    constructor(cryptor, random, makeNet, inboxPathForUser, logger) {
         this.cryptor = cryptor;
+        this.random = random;
         this.makeNet = makeNet;
         this.inboxPathForUser = inboxPathForUser;
         this.logger = logger;
@@ -61,13 +62,14 @@ class ASMail {
     }
     async setupSendingParams(syncedFS) {
         const fs = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, SEND_PARAMS_DATA_FOLDER);
-        this.sendingParams = await sending_params_1.SendingParamsHolder.makeAndInit(fs, this.config.makeParamSetterAndGetter('anon-sender/invites'));
+        this.sendingParams = await sending_params_1.SendingParamsHolder.makeAndInit(fs, this.config.makeParamSetterAndGetter('anon-sender/invites'), this.random);
     }
     async setupDelivery(localFS, getSigner, makeResolver) {
         const fs = await localFS.writableSubRoot(DELIVERY_DATA_FOLDER);
         this.delivery = await delivery_1.Delivery.makeAndStart(fs, {
             address: this.address,
             cryptor: this.cryptor,
+            random: this.random,
             getSigner,
             asmailResolver: makeResolver('asmail', this.logger.logError),
             midResolver: makeResolver('mailerid', this.logger.logError),
@@ -90,6 +92,7 @@ class ASMail {
         this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxSyncedFS, {
             address: this.address,
             cryptor: this.cryptor,
+            random: this.random,
             getSigner,
             getStorages,
             asmailResolver: makeResolver('asmail', this.logger.logError),

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

@@ -3,6 +3,7 @@ import * as delivApi from '../../../lib-common/service-api/asmail/delivery';
 import { FolderInJSON } from '../../../lib-client/xsp-fs/common';
 import { MsgEnvelope, SuggestedNextKeyPair, SendingParams } from './common';
 import { Encryptor } from '../../../lib-common/async-cryptor-wrap';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 type FS = web3n.files.FS;
 type AttachmentsContainer = web3n.asmail.AttachmentsContainer;
 type PKeyCertChain = web3n.keys.PKeyCertChain;
@@ -44,6 +45,7 @@ interface PathInMsg {
  */
 export declare class MsgPacker {
     private segSizeIn256bs;
+    private readonly random;
     private meta;
     private main;
     private mainObjId;
@@ -54,11 +56,11 @@ export declare class MsgPacker {
     private attachmentsCont;
     private workLabel;
     private constructor();
-    static empty(segSizeIn256bs: number): MsgPacker;
+    static empty(segSizeIn256bs: number, random: AsyncRNG): Promise<MsgPacker>;
     static fromPack(p: PackJSON, segSizeIn256bs: number, att: undefined | {
         fs: FS | undefined;
         container: AttachmentsContainer | undefined;
-    }): MsgPacker;
+    }, random: AsyncRNG): MsgPacker;
     private generateObjId;
     private addJsonObj;
     private addFileInto;

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020, 2022, 2026 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
@@ -19,7 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgPacker = void 0;
 const ecma_nacl_1 = require("ecma-nacl");
 const xsp_files_1 = require("xsp-files");
-const random = require("../../../lib-common/random-node");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const folder_node_serialization_1 = require("../../../lib-client/xsp-fs/folder-node-serialization");
 const json_utils_1 = require("../../../lib-common/json-utils");
@@ -71,14 +70,17 @@ function isManagedField(name) {
  * different for each recipient.
  */
 class MsgPacker {
-    constructor(segSizeIn256bs) {
+    constructor(segSizeIn256bs, random) {
         this.segSizeIn256bs = segSizeIn256bs;
+        this.random = random;
         this.meta = undefined;
+        this.mainObjId = undefined;
         this.allObjs = new Map();
         this.readyPack = undefined;
         this.hasAttachments = false;
         this.attachmentsFS = undefined;
         this.attachmentsCont = undefined;
+        this.workLabel = undefined;
         this.wasBodySet = false;
         this.main = {
             'Flow Params': {
@@ -88,15 +90,16 @@ class MsgPacker {
             'Body': {},
             '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) {
-        return new MsgPacker(segSizeIn256bs);
+    static async empty(segSizeIn256bs, random) {
+        const pkr = new MsgPacker(segSizeIn256bs, random);
+        pkr.mainObjId = await pkr.addJsonObj(pkr.main);
+        pkr.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', pkr.mainObjId);
+        return pkr;
     }
-    static fromPack(p, segSizeIn256bs, att) {
-        const packer = new MsgPacker(segSizeIn256bs);
+    static fromPack(p, segSizeIn256bs, att, random) {
+        const packer = new MsgPacker(segSizeIn256bs, random);
         packer.readyPack = p;
         packer.mainObjId = p.meta.objIds[0];
         packer.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', packer.mainObjId);
@@ -118,22 +121,22 @@ class MsgPacker {
         }
         return packer;
     }
-    generateObjId() {
+    async generateObjId() {
         let id;
         do {
-            id = buffer_utils_1.base64urlSafe.pack(random.bytesSync(ecma_nacl_1.secret_box.NONCE_LENGTH));
+            id = await generateObjId(this.random);
         } while (this.allObjs.has(id));
         return id;
     }
-    addJsonObj(json) {
-        const id = this.generateObjId();
-        const key = random.bytesSync(xsp_files_1.KEY_LENGTH);
+    async addJsonObj(json) {
+        const id = await this.generateObjId();
+        const key = await this.random(xsp_files_1.KEY_LENGTH);
         this.allObjs.set(id, { id, json, key });
         return id;
     }
-    addFileInto(folderInfo, fName, file) {
-        const id = this.generateObjId();
-        const key = random.bytesSync(xsp_files_1.KEY_LENGTH);
+    async addFileInto(folderInfo, fName, file) {
+        const id = await this.generateObjId();
+        const key = await this.random(xsp_files_1.KEY_LENGTH);
         this.allObjs.set(id, { id, file, key });
         folderInfo.nodes[fName] = {
             objId: id,
@@ -159,8 +162,8 @@ class MsgPacker {
             // note that links are ignored.
         }
         // attach folder to the rest of the message
-        const id = this.generateObjId();
-        const key = await random.bytes(xsp_files_1.KEY_LENGTH);
+        const id = await this.generateObjId();
+        const key = await this.random(xsp_files_1.KEY_LENGTH);
         this.allObjs.set(id, { id, folder, key });
         outerFolder.nodes[fName] = {
             objId: id,
@@ -350,7 +353,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, this.workLabel);
+        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 }, this.random, cryptor, this.workLabel);
         // make source that inserts message key pack into header
         return makeMainObjSrc(msgKeyPack, bytes, segWriter);
     }
@@ -413,10 +416,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, this.workLabel);
+            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'restart', header }, this.random, 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, this.workLabel);
+            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, this.random, cryptor, this.workLabel);
         }
         // make object source
         let src;
@@ -500,4 +503,7 @@ function fileSrcToByteSrc(fileSrc) {
         seek: fileSrc.seek
     };
 }
+async function generateObjId(random) {
+    return buffer_utils_1.base64urlSafe.pack(await random(ecma_nacl_1.secret_box.NONCE_LENGTH));
+}
 Object.freeze(exports);

package/build/core/asmail/sending-params/index.d.ts

@@ -1,6 +1,7 @@
 import { ResourcesForSending } from '../delivery/common';
 import { ResourcesForReceiving } from '../inbox';
 import { ParamOnServer } from '../../../lib-client/asmail/service-config';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 export { SendingParams } from './params-from-others';
 type WritableFS = web3n.files.WritableFS;
 type SendingResources = ResourcesForSending['correspondents'];
@@ -17,6 +18,6 @@ export declare class SendingParamsHolder {
         set: ReceptionResources['saveParamsForSendingTo'];
     };
     private constructor();
-    static makeAndInit(fs: WritableFS, anonInvitesOnServer: ParamOnServer<'anon-sender/invites'>): Promise<SendingParamsHolder>;
+    static makeAndInit(fs: WritableFS, anonInvitesOnServer: ParamOnServer<'anon-sender/invites'>, random: AsyncRNG): Promise<SendingParamsHolder>;
     close(): Promise<void>;
 }

package/build/core/asmail/sending-params/index.js

@@ -37,13 +37,13 @@ class SendingParamsHolder {
         };
         Object.freeze(this);
     }
-    static async makeAndInit(fs, anonInvitesOnServer) {
+    static async makeAndInit(fs, anonInvitesOnServer, random) {
         const [paramsFromOthers, ownParams] = await Promise.all([
             fs.writableFile(PARAMS_FROM_OTHERS_FILE)
                 .then(f => params_from_others_1.ParamsFromOthers.makeAndInit(f)),
             fs.writableFile(ANONYM_INVITES_FILE)
                 .then(async (anonInvitesFile) => {
-                const anonInvites = await invitations_anon_1.AnonymousInvites.makeAndInit(anonInvitesFile, anonInvitesOnServer);
+                const anonInvites = await invitations_anon_1.AnonymousInvites.makeAndInit(anonInvitesFile, anonInvitesOnServer, random);
                 return await own_params_1.OwnSendingParams.makeAndInit(await fs.writableFile(OWN_PARAMS_FILE), anonInvites);
             })
         ]);

package/build/core/asmail/sending-params/invitations-anon.d.ts

@@ -1,4 +1,5 @@
 import { ParamOnServer } from '../../../lib-client/asmail/service-config';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 type WritableFile = web3n.files.WritableFile;
 interface InvitesJSON {
     invites: {
@@ -10,10 +11,11 @@ interface InvitesJSON {
 }
 export declare class AnonymousInvites {
     private readonly anonInvitesOnServer;
+    private readonly random;
     private invites;
     private readonly fileProc;
     private constructor();
-    static makeAndInit(file: WritableFile, anonInvitesOnServer: ParamOnServer<'anon-sender/invites'>): Promise<AnonymousInvites>;
+    static makeAndInit(file: WritableFile, anonInvitesOnServer: ParamOnServer<'anon-sender/invites'>, random: AsyncRNG): Promise<AnonymousInvites>;
     private onFileEvent;
     protected setFromJSON(json: InvitesJSON): void;
     private toFileJSON;

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

@@ -17,19 +17,20 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnonymousInvites = void 0;
-const random = require("../../../lib-common/random-node");
 const file_based_json_1 = require("../../../lib-client/xsp-fs/util/file-based-json");
 const json_utils_1 = require("../../../lib-common/json-utils");
+const rng_def_1 = require("../../../lib-common/rng-def");
 const INVITE_TOKEN_LEN = 40;
 class AnonymousInvites {
-    constructor(anonInvitesOnServer) {
+    constructor(anonInvitesOnServer, random) {
         this.anonInvitesOnServer = anonInvitesOnServer;
+        this.random = random;
         this.invites = {};
         this.fileProc = new file_based_json_1.JsonFileProc(this.onFileEvent.bind(this));
         Object.seal(this);
     }
-    static async makeAndInit(file, anonInvitesOnServer) {
-        const anonInvites = new AnonymousInvites(anonInvitesOnServer);
+    static async makeAndInit(file, anonInvitesOnServer, random) {
+        const anonInvites = new AnonymousInvites(anonInvitesOnServer, random);
         await anonInvites.fileProc.start(file, () => anonInvites.toFileJSON());
         // XXX these are part of proper syncing logic
         // await anonInvites.absorbRemoteChanges();
@@ -146,7 +147,7 @@ class AnonymousInvites {
     async generateNewRandomInvite() {
         let invite;
         do {
-            invite = await random.stringOfB64Chars(INVITE_TOKEN_LEN);
+            invite = await (0, rng_def_1.stringOfB64Chars)(INVITE_TOKEN_LEN, this.random);
         } while (this.invites[invite]);
         return invite;
     }

package/build/core/id-manager/index.d.ts

@@ -3,6 +3,7 @@ import { LogError, LogWarning } from '../../lib-client/logging/log-to-file';
 import { NetClient } from '../../lib-client/request-utils';
 import { ServiceLocator } from '../../lib-client/service-locator';
 import { MailerIdSigner } from '../../lib-common/mailerid-sigs/user';
+import { AsyncRNG } from '../../lib-common/rng-def';
 type JsonKey = web3n.keys.JsonKey;
 type WritableFS = web3n.files.WritableFS;
 /**
@@ -24,14 +25,15 @@ export declare class IdManager {
     private readonly makeNet;
     private readonly midServiceFor;
     private address;
+    private readonly random;
     private signer;
     private provisioningProc;
     private constructor();
-    static initWithoutStore(address: string, resolver: ServiceLocator, makeNet: () => NetClient, logError: LogError, logWarning: LogWarning): Promise<((midLoginKey: GenerateKey | Uint8Array) => Promise<{
+    static initWithoutStore(address: string, resolver: ServiceLocator, makeNet: () => NetClient, random: AsyncRNG, logError: LogError, logWarning: LogWarning): Promise<((midLoginKey: GenerateKey | Uint8Array) => Promise<{
         idManager: IdManager;
         setupManagerStorage: SetupManagerStorage;
     } | undefined>) | undefined>;
-    static initFromCachedStore(address: string, fs: WritableFS, resolver: ServiceLocator, makeNet: () => NetClient, logError: LogError, logWarning: LogWarning): Promise<IdManager | undefined>;
+    static initFromCachedStore(address: string, fs: WritableFS, resolver: ServiceLocator, makeNet: () => NetClient, random: AsyncRNG, logError: LogError, logWarning: LogWarning): Promise<IdManager | undefined>;
     private startProvisionWithoutSavedKey;
     private provisionUsingSavedKey;
     getId(): string;

package/build/core/id-manager/index.js

@@ -30,11 +30,12 @@ const CERTIFICATE_DURATION_SECONDS = 16 * 60 * 60;
 const ASSERTION_VALIDITY = 15 * 60;
 const MIN_SECS_LEFT_ASSUMED_OK = 10 * 60;
 class IdManager {
-    constructor(store, makeNet, midServiceFor, address) {
+    constructor(store, makeNet, midServiceFor, address, random) {
         this.store = store;
         this.makeNet = makeNet;
         this.midServiceFor = midServiceFor;
         this.address = address;
+        this.random = random;
         this.signer = undefined;
         this.provisioningProc = new synced_1.SingleProc();
         this.getSigner = async () => {
@@ -48,9 +49,9 @@ class IdManager {
         };
         Object.seal(this);
     }
-    static async initWithoutStore(address, resolver, makeNet, logError, logWarning) {
+    static async initWithoutStore(address, resolver, makeNet, random, logError, logWarning) {
         const { store, setupManagerStorage } = key_storage_1.IdKeysStorage.makeWithoutStorage(logError, logWarning);
-        const idManager = new IdManager(store, makeNet, resolver, address);
+        const idManager = new IdManager(store, makeNet, resolver, address, random);
         const provisioning = await idManager.startProvisionWithoutSavedKey(address);
         if (!provisioning) {
             return;
@@ -70,13 +71,13 @@ class IdManager {
             };
         };
     }
-    static async initFromCachedStore(address, fs, resolver, makeNet, logError, logWarning) {
+    static async initFromCachedStore(address, fs, resolver, makeNet, random, logError, logWarning) {
         const store = key_storage_1.IdKeysStorage.makeWithStorage(fs, logError, logWarning);
-        return new IdManager(store, makeNet, resolver, address);
+        return new IdManager(store, makeNet, resolver, address, random);
     }
     async startProvisionWithoutSavedKey(address) {
         const midUrl = await this.midServiceFor(address);
-        const provisioner = new provisioner_1.MailerIdProvisioner(address, midUrl, this.makeNet());
+        const provisioner = new provisioner_1.MailerIdProvisioner(address, midUrl, this.makeNet(), this.random);
         try {
             const provisioning = await provisioner.provisionSigner(undefined);
             const completion = async (defaultSKey) => {
@@ -119,7 +120,7 @@ class IdManager {
         }
         proc = this.provisioningProc.start(async () => {
             const midUrl = await this.midServiceFor(this.address);
-            const provisioner = new provisioner_1.MailerIdProvisioner(this.address, midUrl, this.makeNet());
+            const provisioner = new provisioner_1.MailerIdProvisioner(this.address, midUrl, this.makeNet(), this.random);
             const key = await this.store.getSavedKey();
             if (!key) {
                 throw new Error(`No saved MailerId login key can be found`);

package/build/core/index.d.ts

@@ -2,6 +2,7 @@ import { FactoryOfFSs } from './storage';
 import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
 import type { makeCryptor } from 'ecma-nacl-cryptors';
+import { AsyncRNG } from '../lib-common/rng-def';
 export type { makeCryptor } from 'ecma-nacl-cryptors';
 type RequestedCAPs = web3n.caps.common.RequestedCAPs;
 type W3N = web3n.caps.common.W3N;
@@ -14,6 +15,7 @@ export type MakeNet = () => NetClient;
 export declare class Core {
     private readonly makeNet;
     private readonly makeResolver;
+    private readonly random;
     private readonly appDirs;
     private readonly logger;
     private readonly signUpUrl;
@@ -25,7 +27,7 @@ export declare class Core {
     private closingProc;
     private isInitialized;
     private constructor();
-    static make(conf: CoreConf, makeNet: MakeNet, makeResolver: ServiceLocatorMaker, makeCryptor: makeCryptor): Core;
+    static make(conf: CoreConf, makeNet: MakeNet, makeResolver: ServiceLocatorMaker, makeCryptor: makeCryptor, random: AsyncRNG): Core;
     start(): {
         capsForStartup: web3n.startup.W3N;
         coreInit: Promise<string>;

package/build/core/index.js

@@ -31,9 +31,10 @@ const constants_1 = require("./storage/common/constants");
 const config_1 = require("./asmail/config");
 const deferred_1 = require("../lib-common/processes/deferred");
 class Core {
-    constructor(makeNet, makeResolver, makeCryptor, appDirs, logger, signUpUrl) {
+    constructor(makeNet, makeResolver, makeCryptor, random, appDirs, logger, signUpUrl) {
         this.makeNet = makeNet;
         this.makeResolver = makeResolver;
+        this.random = random;
         this.appDirs = appDirs;
         this.logger = logger;
         this.signUpUrl = signUpUrl;
@@ -41,21 +42,21 @@ class Core {
         this.closingProc = undefined;
         this.isInitialized = false;
         this.cryptor = makeCryptor(this.logger.logError, this.logger.logWarning);
-        this.storages = new storage_1.Storages(this.cryptor.cryptor.sbox, this.appDirs.storagePathFor);
-        this.keyrings = new keyring_1.Keyrings(this.cryptor.cryptor.sbox, this.logger);
-        this.asmail = new asmail_1.ASMail(this.cryptor.cryptor.sbox, this.makeNet, this.appDirs.inboxPathFor, this.logger);
+        this.storages = new storage_1.Storages(this.cryptor.cryptor.sbox, this.random, this.appDirs.storagePathFor);
+        this.keyrings = new keyring_1.Keyrings(this.cryptor.cryptor.sbox, this.random, this.logger);
+        this.asmail = new asmail_1.ASMail(this.cryptor.cryptor.sbox, this.random, this.makeNet, this.appDirs.inboxPathFor, this.logger);
         Object.seal(this);
     }
-    static make(conf, makeNet, makeResolver, makeCryptor) {
+    static make(conf, makeNet, makeResolver, makeCryptor, random) {
         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);
+        const core = new Core(makeNet, makeResolver, makeCryptor, random, dirs, logger, conf.signUpUrl);
         return core;
     }
     start() {
         const { promise: midPromise, resolve: midDone } = (0, deferred_1.defer)();
         const { watchBoot, emitBootEvent } = makeForBootEvents();
-        const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, this.makeNet, this.appDirs.getUsersOnDisk, user => this.initForNewUser(user, midDone, emitBootEvent), watchBoot, this.logger.logError);
+        const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, this.random, this.makeNet, this.appDirs.getUsersOnDisk, user => this.initForNewUser(user, midDone, emitBootEvent), watchBoot, this.logger.logError);
         const signIn = new sign_in_1.SignIn(this.cryptor.cryptor, addr => this.initForExistingUserWithoutCache(addr, midDone, emitBootEvent), (addr, storageKey) => this.initForExistingUserWithCache(addr, storageKey, midDone, emitBootEvent), this.appDirs.getUsersOnDisk, watchBoot, this.logger.logError);
         const capsForStartup = {
             signUp: signUp.exposedService(),
@@ -93,7 +94,7 @@ class Core {
         });
         try {
             // 1) init of id manager without setting fs
-            const stepTwo = await id_manager_1.IdManager.initWithoutStore(u.address, this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const stepTwo = await id_manager_1.IdManager.initWithoutStore(u.address, this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.random, this.logger.logError, this.logger.logWarning);
             if (!stepTwo) {
                 const message = `MailerId server doesn't recognize identity ${u.address}`;
                 emitBootEvent({ message, isError: true });
@@ -141,7 +142,7 @@ class Core {
         });
         try {
             // 1) init of id manager without setting fs
-            const stepTwo = await id_manager_1.IdManager.initWithoutStore(address, this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const stepTwo = await id_manager_1.IdManager.initWithoutStore(address, this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.random, this.logger.logError, this.logger.logWarning);
             if (!stepTwo) {
                 emitBootEvent({
                     isError: true, message: `MailerId server doesn't recognize identity ${address}`
@@ -212,7 +213,7 @@ class Core {
                 return false;
             }
             emitBootEvent({ message: `✔️  main storage is opened` });
-            const idManager = await id_manager_1.IdManager.initFromCachedStore(address, await this.storages.makeSyncedFSForApp(constants_1.MAILERID_APP_NAME), this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const idManager = await id_manager_1.IdManager.initFromCachedStore(address, await this.storages.makeSyncedFSForApp(constants_1.MAILERID_APP_NAME), this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.random, this.logger.logError, this.logger.logWarning);
             if (!idManager) {
                 return false;
             }

package/build/core/keyring/common.d.ts

@@ -1,3 +1,4 @@
+import { AsyncRNG } from '../../lib-common/rng-def';
 type JsonKey = web3n.keys.JsonKey;
 type JsonKeyShort = web3n.keys.JsonKeyShort;
 export type MsgKeyRole = 'suggested' | 'in_use' | 'old' | 'published_intro' | 'prev_published_intro' | 'introductory';
@@ -30,7 +31,7 @@ export declare const KEY_USE: {
  * These are to be used with NaCl's box (Curve+XSalsa+Poly encryption).
  * Key ids are the same in this intimate pair.
  */
-export declare function generateKeyPair(): Promise<JWKeyPair>;
+export declare function generateKeyPair(random: AsyncRNG): Promise<JWKeyPair>;
 /**
  * We have this function for future use by a keyring, that takes symmetric key.
  * This keyring, is specifically tailored to handle short-lived public keys.
@@ -38,7 +39,7 @@ export declare function generateKeyPair(): Promise<JWKeyPair>;
  * This returns a JWK form of a key for NaCl's secret box (XSalsa+Poly
  * encryption).
  */
-export declare function generateSymmetricKey(): Promise<JsonKey>;
+export declare function generateSymmetricKey(random: AsyncRNG): Promise<JsonKey>;
 /**
  * This returns bytes of from a given secret key's JWK form
  * @param key is a JWK form of a key