core-3nweb-client-lib 0.47.3 → 0.48.0

package/build/core/keyring/common.js

@@ -28,7 +28,7 @@ exports.msgKeyPackSizeFor = msgKeyPackSizeFor;
  */
 const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
-const random_node_1 = require("../../lib-common/random-node");
+const rng_def_1 = require("../../lib-common/rng-def");
 exports.KID_LENGTH = 16;
 exports.PID_LENGTH = 2;
 exports.KEY_USE = {
@@ -43,10 +43,10 @@ Object.freeze(exports.KEY_USE);
  * These are to be used with NaCl's box (Curve+XSalsa+Poly encryption).
  * Key ids are the same in this intimate pair.
  */
-async function generateKeyPair() {
-    const skeyBytes = await (0, random_node_1.bytes)(ecma_nacl_1.box.KEY_LENGTH);
+async function generateKeyPair(random) {
+    const skeyBytes = await random(ecma_nacl_1.box.KEY_LENGTH);
     const pkeyBytes = ecma_nacl_1.box.generate_pubkey(skeyBytes);
-    const kid = await (0, random_node_1.stringOfB64Chars)(exports.KID_LENGTH);
+    const kid = await (0, rng_def_1.stringOfB64Chars)(exports.KID_LENGTH, random);
     const skey = {
         use: exports.KEY_USE.SECRET,
         alg: ecma_nacl_1.box.JWK_ALG_NAME,
@@ -69,12 +69,12 @@ async function generateKeyPair() {
  * This returns a JWK form of a key for NaCl's secret box (XSalsa+Poly
  * encryption).
  */
-async function generateSymmetricKey() {
+async function generateSymmetricKey(random) {
     return {
         use: exports.KEY_USE.SYMMETRIC,
-        k: buffer_utils_1.base64.pack(await (0, random_node_1.bytes)(ecma_nacl_1.secret_box.KEY_LENGTH)),
+        k: buffer_utils_1.base64.pack(await random(ecma_nacl_1.secret_box.KEY_LENGTH)),
         alg: ecma_nacl_1.secret_box.JWK_ALG_NAME,
-        kid: await (0, random_node_1.stringOfB64Chars)(exports.KID_LENGTH)
+        kid: await (0, rng_def_1.stringOfB64Chars)(exports.KID_LENGTH, random)
     };
 }
 ;

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

@@ -6,6 +6,7 @@ import { SuggestedNextKeyPair } from '../asmail/msg/opener';
 import { KeyPairsStorage } from './index';
 import { Decryptor } from '../../lib-common/async-cryptor-wrap';
 import { AsyncSBoxCryptor } from 'xsp-files';
+import { AsyncRNG } from '../../lib-common/rng-def';
 type JsonKey = web3n.keys.JsonKey;
 type JsonKeyShort = web3n.keys.JsonKeyShort;
 type CorrespondentKeysInfo = web3n.keys.CorrespondentKeysInfo;
@@ -80,7 +81,8 @@ export interface RatchetedSendingPair {
 export type SendingPair = IntroductorySendingPair | RatchetedSendingPair;
 export declare function msgMasterDecryptor(cryptor: AsyncSBoxCryptor, skey: JsonKey, pkey: JsonKeyShort): Decryptor;
 export declare class CorrespondentKeys {
-    private keyring;
+    private readonly keyring;
+    private readonly random;
     private keys;
     get correspondent(): string;
     /**
@@ -90,7 +92,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: KeyPairsStorage, address: string | undefined, serialData?: string);
+    constructor(keyring: KeyPairsStorage, random: AsyncRNG, 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/keyring/correspondent-keys.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 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
@@ -22,16 +22,16 @@ exports.msgMasterDecryptor = msgMasterDecryptor;
  * This file contains functionality, used inside keyring.
  */
 const common_1 = require("./common");
-const random = require("../../lib-common/random-node");
 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 rng_def_1 = require("../../lib-common/rng-def");
+async function generatePids(random) {
     const pids = [];
     for (let i = 0; i < 5; i += 1) {
-        pids[i] = random.stringOfB64UrlSafeCharsSync(common_1.PID_LENGTH);
+        pids[i] = await (0, rng_def_1.stringOfB64UrlSafeChars)(common_1.PID_LENGTH, random);
     }
     return pids;
 }
@@ -68,8 +68,9 @@ class CorrespondentKeys {
      * @param serialData from which this object should be reconstructed.
      * Either serialData, or an address should be defined, not both.
      */
-    constructor(keyring, address, serialData) {
+    constructor(keyring, random, address, serialData) {
         this.keyring = keyring;
+        this.random = random;
         this.keys = undefined;
         if (address) {
             this.keys = {
@@ -131,10 +132,10 @@ class CorrespondentKeys {
         // generate new suggested pair
         const corrPKey = this.keys.sendingPair.recipientPKey;
         const isSenderIntroKey = (this.keys.sendingPair.type === 'intro');
-        const recipientKey = await (0, common_1.generateKeyPair)();
+        const recipientKey = await (0, common_1.generateKeyPair)(this.random);
         const msgMasterKey = calcMsgMasterKeyB64(recipientKey.skey, corrPKey);
         const pair = {
-            pids: generatePids(),
+            pids: await generatePids(this.random),
             recipientKey,
             senderPKey: corrPKey,
             isSenderIntroKey,
@@ -300,7 +301,7 @@ class CorrespondentKeys {
         let msgMasterKey;
         let msgCount;
         if (p.type === 'intro') {
-            const senderKey = await (0, common_1.generateKeyPair)();
+            const senderKey = await (0, common_1.generateKeyPair)(this.random);
             msgMasterKey = calcMsgMasterKey(senderKey.skey, p.recipientPKey);
             currentPair = {
                 senderPKey: senderKey.pkey,
@@ -344,7 +345,7 @@ function selectPid(pair) {
     if (pair.pids.length < 1) {
         throw new Error("There are no pair ids in array.");
     }
-    const i = Math.round((pair.pids.length - 1) * random.uint8Sync() / 255);
+    const i = Math.round((pair.pids.length - 1) * Math.random());
     return pair.pids[i];
 }
 /**

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

@@ -6,6 +6,7 @@ import { ResourcesForReceiving } from '../asmail/inbox';
 import { GetSigner } from '../id-manager';
 import { ParamOnServer } from '../../lib-client/asmail/service-config';
 import { Logger } from '../../lib-client/logging/log-to-file';
+import { AsyncRNG } from '../../lib-common/rng-def';
 export { KEY_USE, MsgKeyRole } from './common';
 export interface MsgKeyInfo {
     correspondent: string;
@@ -38,6 +39,7 @@ export interface KeyPairsStorage {
 }
 export declare class Keyrings {
     private readonly cryptor;
+    private readonly random;
     private readonly logger;
     /**
      * This is a map from correspondents' canonical addresses to key objects.
@@ -47,7 +49,7 @@ export declare class Keyrings {
     private readonly workLabel;
     private storage;
     private publishedKeys;
-    constructor(cryptor: AsyncSBoxCryptor, logger: Logger);
+    constructor(cryptor: AsyncSBoxCryptor, random: AsyncRNG, logger: Logger);
     private readonly asKeyPairsStorage;
     private addCorrespondent;
     init(fs: WritableFS, getSigner: GetSigner, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<void>;

package/build/core/keyring/index.js

@@ -22,7 +22,7 @@ const id_to_email_map_1 = require("./id-to-email-map");
 const common_1 = require("./common");
 const async_cryptor_wrap_1 = require("../../lib-common/async-cryptor-wrap");
 const xsp_files_1 = require("xsp-files");
-const random = require("../../lib-common/random-node");
+const random = require("../../lib-common-on-node/random-node");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../lib-common/canonical-address");
 const common_2 = require("../asmail/delivery/common");
@@ -34,8 +34,9 @@ Object.defineProperty(exports, "KEY_USE", { enumerable: true, get: function () {
 const FILE_FOR_INTRO_KEY_ON_SERVER = 'introductory-keys/published-on-server.json';
 // XXX Keyring is just a storage and crypto functionality around keys
 class Keyrings {
-    constructor(cryptor, logger) {
+    constructor(cryptor, random, logger) {
         this.cryptor = cryptor;
+        this.random = random;
         this.logger = logger;
         /**
          * This is a map from correspondents' canonical addresses to key objects.
@@ -53,8 +54,8 @@ class Keyrings {
     }
     addCorrespondent(address, serialForm) {
         const ck = (serialForm ?
-            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, undefined, serialForm) :
-            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, address));
+            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, this.random, undefined, serialForm) :
+            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, this.random, address));
         if (this.corrKeys.has(ck.correspondent)) {
             throw new Error(`Correspondent with address ${ck.correspondent} is already present.`);
         }
@@ -65,7 +66,7 @@ class Keyrings {
         return ck;
     }
     async init(fs, getSigner, pkeyOnServer) {
-        this.publishedKeys = await published_intro_key_1.PublishedIntroKey.makeAndInit(await fs.writableFile(FILE_FOR_INTRO_KEY_ON_SERVER), getSigner, pkeyOnServer);
+        this.publishedKeys = await published_intro_key_1.PublishedIntroKey.makeAndInit(await fs.writableFile(FILE_FOR_INTRO_KEY_ON_SERVER), getSigner, this.random, pkeyOnServer);
         this.storage = (0, keyring_storage_1.makeKeyringStorage)(fs);
         await this.storage.start();
         const serialForm = await this.storage.load();

package/build/core/keyring/published-intro-key.d.ts

@@ -1,16 +1,18 @@
 import { ParamOnServer } from '../../lib-client/asmail/service-config';
+import { AsyncRNG } from '../../lib-common/rng-def';
 import { GetSigner } from '../id-manager';
 import { JWKeyPair, MsgKeyRole } from './common';
 type WritableFile = web3n.files.WritableFile;
 type IntroKeyCAP = web3n.keys.Keyrings['introKeyOnASMailServer'];
 export declare class PublishedIntroKey {
     private readonly getSigner;
+    private readonly random;
     private pkeyOnServer;
     private published;
     private readonly fileProc;
     private periodicExpiryCheck;
     private constructor();
-    static makeAndInit(file: WritableFile, getSigner: GetSigner, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<PublishedIntroKey>;
+    static makeAndInit(file: WritableFile, getSigner: GetSigner, random: AsyncRNG, pkeyOnServer: ParamOnServer<'init-pub-key'>): Promise<PublishedIntroKey>;
     private startExpiryCheckProcess;
     close(): Promise<void>;
     private onFileEvent;

package/build/core/keyring/published-intro-key.js

@@ -23,8 +23,9 @@ const common_1 = require("./common");
 const INTRO_KEY_VALIDITY = 31 * 24 * 60 * 60;
 const UPDATE_BEFORE_EXPIRY = 7 * 24 * 60 * 60;
 class PublishedIntroKey {
-    constructor(getSigner, pkeyOnServer) {
+    constructor(getSigner, random, pkeyOnServer) {
         this.getSigner = getSigner;
+        this.random = random;
         this.pkeyOnServer = pkeyOnServer;
         this.published = {
             previous: []
@@ -33,8 +34,8 @@ class PublishedIntroKey {
         this.fileProc = new file_based_json_1.JsonFileProc(this.onFileEvent.bind(this));
         Object.seal(this);
     }
-    static async makeAndInit(file, getSigner, pkeyOnServer) {
-        const pk = new PublishedIntroKey(getSigner, pkeyOnServer);
+    static async makeAndInit(file, getSigner, random, pkeyOnServer) {
+        const pk = new PublishedIntroKey(getSigner, random, pkeyOnServer);
         if (file.isNew) {
             await pk.fileProc.start(file, () => pk.toFileJSON());
             await pk.update();
@@ -107,7 +108,7 @@ class PublishedIntroKey {
     }
     async makeNewIntroKey() {
         const signer = await this.getSigner();
-        const pair = await (0, common_1.generateKeyPair)();
+        const pair = await (0, common_1.generateKeyPair)(this.random);
         const certs = {
             pkeyCert: signer.certifyPublicKey(pair.pkey, INTRO_KEY_VALIDITY),
             userCert: signer.userCert,

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

@@ -3,6 +3,7 @@ import * as keyDeriv from '../../lib-client/key-derivation';
 import type { GetUsersOnDisk } from '../app-files';
 import { LogError } from '../../lib-client/logging/log-to-file';
 import type { Cryptor } from 'ecma-nacl-cryptors';
+import { AsyncRNG } from '../../lib-common/rng-def';
 type JsonKey = web3n.keys.JsonKey;
 export interface ScryptGenParams {
     logN: number;
@@ -12,10 +13,11 @@ export interface ScryptGenParams {
 }
 type SignUpService = web3n.startup.SignUpService;
 export declare class SignUp {
-    private cryptor;
-    private makeNet;
-    private getUsersOnDisk;
-    private initForNewUser;
+    private readonly cryptor;
+    private readonly random;
+    private readonly makeNet;
+    private readonly getUsersOnDisk;
+    private readonly initForNewUser;
     private readonly watchBoot;
     private readonly logError;
     private mid;
@@ -23,7 +25,7 @@ export declare class SignUp {
     private serviceURL;
     private netLazyInit;
     private get net();
-    constructor(serviceURL: string, cryptor: Cryptor, makeNet: () => NetClient, getUsersOnDisk: GetUsersOnDisk, initForNewUser: (u: CreatedUser) => Promise<void>, watchBoot: SignUpService['watchBoot'], logError: LogError);
+    constructor(serviceURL: string, cryptor: Cryptor, random: AsyncRNG, makeNet: () => NetClient, getUsersOnDisk: GetUsersOnDisk, initForNewUser: (u: CreatedUser) => Promise<void>, watchBoot: SignUpService['watchBoot'], logError: LogError);
     private setServiceURL;
     private getAvailableDomains;
     private getAvailableAddresses;

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

@@ -22,10 +22,10 @@ const jwkeys_1 = require("../../lib-common/jwkeys");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../lib-common/canonical-address");
 const keyDeriv = require("../../lib-client/key-derivation");
-const random = require("../../lib-common/random-node");
 const ecma_nacl_1 = require("ecma-nacl");
 const sign_in_1 = require("./sign-in");
 const error_1 = require("../../lib-common/exceptions/error");
+const rng_def_1 = require("../../lib-common/rng-def");
 /**
  * With these parameters scrypt shall use memory around:
  * (2^7)*r*N === (2^7)*(2^3)*(2^17) === 2^27 === (2^7)*(2^20) === 128MB
@@ -38,13 +38,13 @@ const defaultDerivParams = {
 Object.freeze(defaultDerivParams);
 const SALT_LEN = 32;
 const KEY_ID_LEN = 10;
-async function makeLabeledMidLoginKey(cryptor) {
-    const sk = await random.bytes(ecma_nacl_1.box.KEY_LENGTH);
+async function makeLabeledMidLoginKey(cryptor, random) {
+    const sk = await random(ecma_nacl_1.box.KEY_LENGTH);
     const skey = (0, jwkeys_1.keyToJson)({
         k: sk,
         alg: ecma_nacl_1.box.JWK_ALG_NAME,
         use: jwkeys_1.use.MID_PKLOGIN,
-        kid: await random.stringOfB64Chars(KEY_ID_LEN)
+        kid: await (0, rng_def_1.stringOfB64Chars)(KEY_ID_LEN, random)
     });
     const pkey = (0, jwkeys_1.keyToJson)({
         k: await cryptor.box.generate_pubkey(sk),
@@ -61,8 +61,9 @@ class SignUp {
         }
         return this.netLazyInit;
     }
-    constructor(serviceURL, cryptor, makeNet, getUsersOnDisk, initForNewUser, watchBoot, logError) {
+    constructor(serviceURL, cryptor, random, makeNet, getUsersOnDisk, initForNewUser, watchBoot, logError) {
         this.cryptor = cryptor;
+        this.random = random;
         this.makeNet = makeNet;
         this.getUsersOnDisk = getUsersOnDisk;
         this.initForNewUser = initForNewUser;
@@ -112,7 +113,7 @@ class SignUp {
             logN: defaultDerivParams.logN,
             r: defaultDerivParams.r,
             p: defaultDerivParams.p,
-            salt: buffer_utils_1.base64.pack(await random.bytes(SALT_LEN))
+            salt: buffer_utils_1.base64.pack(await this.random(SALT_LEN))
         };
         const progressCB = (0, sign_in_1.makeKeyGenProgressCB)(progressStart, progressEnd, originalProgressCB);
         const skey = await keyDeriv.deriveStorageSKey(this.cryptor, pass, derivParams, progressCB);
@@ -128,11 +129,11 @@ class SignUp {
             logN: defaultDerivParams.logN,
             r: defaultDerivParams.r,
             p: defaultDerivParams.p,
-            salt: buffer_utils_1.base64.pack(await random.bytes(SALT_LEN))
+            salt: buffer_utils_1.base64.pack(await this.random(SALT_LEN))
         };
         const progressCB = (0, sign_in_1.makeKeyGenProgressCB)(progressStart, progressEnd, originalProgressCB);
         const defaultPair = await keyDeriv.deriveMidKeyPair(this.cryptor, pass, derivParams, progressCB, jwkeys_1.use.MID_PKLOGIN, '_');
-        const labeledKey = await makeLabeledMidLoginKey(this.cryptor);
+        const labeledKey = await makeLabeledMidLoginKey(this.cryptor, this.random);
         this.mid = {
             defaultSKey: defaultPair.skey,
             labeledSKey: labeledKey.skey,

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

@@ -8,17 +8,19 @@ import { StoragePathForUser } from '../app-files';
 import { LogError } from '../../lib-client/logging/log-to-file';
 import { MakeNet } from '..';
 import type { Cryptor } from 'ecma-nacl-cryptors';
+import { AsyncRNG } from '../../lib-common/rng-def';
 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;
+    private readonly cryptor;
+    private readonly random;
+    private readonly storageDirForUser;
     private synced;
     private local;
     private preCloseWaits;
-    constructor(cryptor: AsyncSBoxCryptor, storageDirForUser: StoragePathForUser);
+    constructor(cryptor: AsyncSBoxCryptor, random: AsyncRNG, storageDirForUser: StoragePathForUser);
     makeStorageCAP(appDomain: string, policy: StoragePolicy): {
         cap: Service;
         close: () => void;

package/build/core/storage/index.js

@@ -216,8 +216,9 @@ class StorageAndFS {
 Object.freeze(StorageAndFS.prototype);
 Object.freeze(StorageAndFS);
 class Storages {
-    constructor(cryptor, storageDirForUser) {
+    constructor(cryptor, random, storageDirForUser) {
         this.cryptor = cryptor;
+        this.random = random;
         this.storageDirForUser = storageDirForUser;
         this.synced = undefined;
         this.local = undefined;
@@ -286,7 +287,7 @@ class Storages {
             return;
         }
         const key = await (0, key_derivation_1.deriveStorageSKey)(cryptor, pass, params, storeKeyProgressCB);
-        const indicatorStore = await StorageAndFS.existing(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, async () => { }), key);
+        const indicatorStore = await StorageAndFS.existing(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, this.random, async () => { }), key);
         return (indicatorStore ? key : undefined);
     }
     async startInitFromCache(user, keyGen, makeNet, resolver, logError) {
@@ -296,11 +297,11 @@ class Storages {
             return;
         }
         const key = await keyGen(params);
-        this.local = await StorageAndFS.existing(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, logError), key);
+        this.local = await StorageAndFS.existing(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, this.random, logError), key);
         if (!this.local) {
             return;
         }
-        const { syncedStore, setupRemoteAndStartObjProcs } = await storage_1.SyncedStore.makeAndStartWithoutRemote((0, path_1.join)(storageDir, SYNCED_STORAGE_DIR), user, this.storageGetterForSyncedStorage, this.cryptor, () => resolver(user), makeNet(), logError);
+        const { syncedStore, setupRemoteAndStartObjProcs } = await storage_1.SyncedStore.makeAndStartWithoutRemote((0, path_1.join)(storageDir, SYNCED_STORAGE_DIR), user, this.storageGetterForSyncedStorage, this.cryptor, this.random, () => resolver(user), makeNet(), logError);
         this.synced = await StorageAndFS.existing(syncedStore, key);
         key.fill(0);
         if (!this.synced) {
@@ -310,20 +311,20 @@ class Storages {
     }
     async initFromRemote(user, getSigner, generateKey, makeNet, resolver, logError) {
         const storageDir = this.storageDirForUser(user);
-        const { startObjProcs, syncedStore } = await storage_1.SyncedStore.makeAndStart((0, path_1.join)(storageDir, SYNCED_STORAGE_DIR), user, getSigner, this.storageGetterForSyncedStorage, this.cryptor, () => resolver(user), makeNet(), logError);
+        const { startObjProcs, syncedStore } = await storage_1.SyncedStore.makeAndStart((0, path_1.join)(storageDir, SYNCED_STORAGE_DIR), user, getSigner, this.storageGetterForSyncedStorage, this.cryptor, this.random, () => resolver(user), makeNet(), logError);
         const params = await getAndCacheRootKeyDerivParamsFromServer(storageDir, syncedStore.getRootKeyDerivParamsFromServer);
         const key = await generateKey(params);
         this.synced = await StorageAndFS.existing(syncedStore, key);
-        this.local = await StorageAndFS.makeNew(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, logError), key);
+        this.local = await StorageAndFS.makeNew(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, this.random, logError), key);
         key.fill(0);
         startObjProcs();
         return (!!this.synced && !!this.local);
     }
     async initFreshForNewUser(user, getSigner, params, key, makeNet, resolver, logError) {
         const storageDir = this.storageDirForUser(user);
-        const { startObjProcs, syncedStore } = await storage_1.SyncedStore.makeAndStart((0, path_1.join)(storageDir, SYNCED_STORAGE_DIR), user, getSigner, this.storageGetterForSyncedStorage, this.cryptor, () => resolver(user), makeNet(), logError);
+        const { startObjProcs, syncedStore } = await storage_1.SyncedStore.makeAndStart((0, path_1.join)(storageDir, SYNCED_STORAGE_DIR), user, getSigner, this.storageGetterForSyncedStorage, this.cryptor, this.random, () => resolver(user), makeNet(), logError);
         this.synced = await StorageAndFS.makeNew(syncedStore, key);
-        this.local = await StorageAndFS.makeNew(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, logError), key);
+        this.local = await StorageAndFS.makeNew(await storage_2.LocalStorage.makeAndStart((0, path_1.join)(storageDir, LOCAL_STORAGE_DIR), this.storageGetterForLocalStorage, this.cryptor, this.random, logError), key);
         key.fill(0);
         await saveRootKeyDerivParamsToDisk(storageDir, params);
         startObjProcs();

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

@@ -2,6 +2,7 @@ import { Storage, NodesContainer, StorageGetter, ObjId, NodeEvent, LocalObjStatu
 import { LogError } from '../../../lib-client/logging/log-to-file';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import { Observable } from 'rxjs';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 type FolderEvent = web3n.files.FolderEvent;
 type FileEvent = web3n.files.FileEvent;
 type FSType = web3n.files.FSType;
@@ -9,6 +10,7 @@ export declare class LocalStorage implements Storage {
     private readonly files;
     private readonly getStorages;
     readonly cryptor: AsyncSBoxCryptor;
+    readonly random: AsyncRNG;
     readonly logError: LogError;
     readonly type = "local";
     readonly versioned = true;
@@ -16,7 +18,7 @@ export declare class LocalStorage implements Storage {
     readonly connect: undefined;
     private readonly events;
     private constructor();
-    static makeAndStart(path: string, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, logError: LogError): Promise<Storage>;
+    static makeAndStart(path: string, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, random: AsyncRNG, logError: LogError): Promise<Storage>;
     getNodeEvents(): Observable<NodeEvent>;
     broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, childObjId: ObjId | undefined, event: FolderEvent | FileEvent): void;
     storageForLinking(type: FSType, location?: string): Storage;

package/build/core/storage/local/storage.js

@@ -19,16 +19,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalStorage = void 0;
 const common_1 = require("../../../lib-client/xsp-fs/common");
 const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
-const random_node_1 = require("../../../lib-common/random-node");
+const random_node_1 = require("../../../lib-common-on-node/random-node");
 const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const obj_files_1 = require("./obj-files");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 class LocalStorage {
-    constructor(files, getStorages, cryptor, logError) {
+    constructor(files, getStorages, cryptor, random, logError) {
         this.files = files;
         this.getStorages = getStorages;
         this.cryptor = cryptor;
+        this.random = random;
         this.logError = logError;
         this.type = 'local';
         this.versioned = true;
@@ -37,9 +38,9 @@ class LocalStorage {
         this.events = new utils_for_observables_1.Broadcast();
         Object.seal(this);
     }
-    static async makeAndStart(path, getStorages, cryptor, logError) {
+    static async makeAndStart(path, getStorages, cryptor, random, logError) {
         const files = await obj_files_1.ObjFiles.makeFor(path, logError);
-        const s = new LocalStorage(files, getStorages, cryptor, logError);
+        const s = new LocalStorage(files, getStorages, cryptor, random, logError);
         return (0, common_1.wrapStorageImplementation)(s);
     }
     getNodeEvents() {

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

@@ -6,6 +6,7 @@ import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import { NetClient } from '../../../lib-client/request-utils';
 import { Observable } from 'rxjs';
 import { UploadHeaderChange } from '../../../lib-client/xsp-fs/common';
+import { AsyncRNG } from '../../../lib-common/rng-def';
 type FolderEvent = web3n.files.FolderEvent;
 type FileEvent = web3n.files.FileEvent;
 type SyncStatus = web3n.files.SyncStatus;
@@ -16,6 +17,7 @@ export declare class SyncedStore implements ISyncedStorage {
     private readonly remoteStorage;
     private readonly getStorages;
     readonly cryptor: AsyncSBoxCryptor;
+    readonly random: AsyncRNG;
     readonly logError: LogError;
     readonly type: web3n.files.FSType;
     readonly versioned = true;
@@ -24,11 +26,11 @@ export declare class SyncedStore implements ISyncedStorage {
     private readonly uploader;
     private readonly events;
     private constructor();
-    static makeAndStart(path: string, user: string, getSigner: IGetMailerIdSigner, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
+    static makeAndStart(path: string, user: string, getSigner: IGetMailerIdSigner, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, random: AsyncRNG, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
         syncedStore: ISyncedStorage;
         startObjProcs: () => void;
     }>;
-    static makeAndStartWithoutRemote(path: string, user: string, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
+    static makeAndStartWithoutRemote(path: string, user: string, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, random: AsyncRNG, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
         syncedStore: ISyncedStorage;
         setupRemoteAndStartObjProcs: (getSigner: IGetMailerIdSigner) => void;
     }>;

package/build/core/storage/synced/storage.js

@@ -21,7 +21,7 @@ const common_1 = require("../../../lib-client/xsp-fs/common");
 const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
 const storage_owner_1 = require("../../../lib-client/3nstorage/storage-owner");
 const obj_files_1 = require("./obj-files");
-const random_node_1 = require("../../../lib-common/random-node");
+const random_node_1 = require("../../../lib-common-on-node/random-node");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const xsp_files_1 = require("xsp-files");
 const remote_events_1 = require("./remote-events");
@@ -29,11 +29,12 @@ const upsyncer_1 = require("./upsyncer");
 const rxjs_1 = require("rxjs");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 class SyncedStore {
-    constructor(files, remoteStorage, getStorages, cryptor, logError) {
+    constructor(files, remoteStorage, getStorages, cryptor, random, logError) {
         this.files = files;
         this.remoteStorage = remoteStorage;
         this.getStorages = getStorages;
         this.cryptor = cryptor;
+        this.random = random;
         this.logError = logError;
         this.type = 'synced';
         this.versioned = true;
@@ -43,10 +44,10 @@ class SyncedStore {
         this.uploader = new upsyncer_1.UpSyncer(this.remoteStorage, this.logError);
         Object.seal(this);
     }
-    static async makeAndStart(path, user, getSigner, getStorages, cryptor, remoteServiceUrl, net, logError) {
+    static async makeAndStart(path, user, getSigner, getStorages, cryptor, random, remoteServiceUrl, net, logError) {
         const remote = storage_owner_1.StorageOwner.make(user, getSigner, remoteServiceUrl, net);
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, () => s.whenConnected(), logError);
-        const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
+        const s = new SyncedStore(objFiles, remote, getStorages, cryptor, random, logError);
         s.uploader.start();
         return {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
@@ -55,10 +56,10 @@ class SyncedStore {
             }
         };
     }
-    static async makeAndStartWithoutRemote(path, user, getStorages, cryptor, remoteServiceUrl, net, logError) {
+    static async makeAndStartWithoutRemote(path, user, getStorages, cryptor, random, remoteServiceUrl, net, logError) {
         const { remote, setMid } = storage_owner_1.StorageOwner.makeBeforeMidSetup(user, remoteServiceUrl, net);
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, () => s.whenConnected(), logError);
-        const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
+        const s = new SyncedStore(objFiles, remote, getStorages, cryptor, random, logError);
         return {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
             setupRemoteAndStartObjProcs: getSigner => {

package/build/injected-globals/platform-devfs.d.ts

@@ -1,4 +1,4 @@
-import { Abortable } from 'events';
+import type { Abortable } from 'events';
 import type { BufferEncodingOption, promises as fsFns, Mode, ObjectEncodingOptions, OpenMode, RmDirOptions, StatOptions, Stats } from 'fs';
 import { FlagAndOpenMode } from 'fs/promises';
 import type Stream = require('stream');
@@ -61,9 +61,7 @@ declare function readlink(path: string, options: BufferEncodingOption): Promise<
 declare function readlink(path: string, options?: ObjectEncodingOptions | string | null): Promise<string | Buffer>;
 declare function lstat(path: string, opts?: StatOptions): Promise<Stats>;
 declare function stat(path: string, opts?: StatOptions): Promise<Stats>;
-declare function readdir(path: string, options?: {
-    recursive?: boolean;
-}): Promise<string[]>;
+declare function readdir(path: string): Promise<string[]>;
 declare function rmdir(path: string, options?: RmDirOptions): Promise<void>;
 declare function unlink(path: string): Promise<void>;
 declare function rename(oldPath: string, newPath: string): Promise<void>;

package/build/ipc-via-protobuf/connector-services-side.js

@@ -18,7 +18,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExposedObjs = exports.ServicesSideImpl = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
-const random_node_1 = require("../lib-common/random-node");
 const connector_1 = require("./connector");
 class ServicesSideImpl {
     constructor(sendMsg) {
@@ -161,7 +160,7 @@ class ExposedObjs {
     newRef(objType) {
         let id;
         do {
-            id = (0, random_node_1.stringOfB64CharsSync)(20);
+            id = `${Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)}`;
         } while (this.objs.has(id));
         return {
             objType, path: [id]

package/build/lib-client/mailer-id/provisioner.d.ts

@@ -1,6 +1,7 @@
 import { NetClient } from '../request-utils';
 import { ServiceUser, ICalcDHSharedKey, LoginCompletion } from '../user-with-pkl-session';
 import { MailerIdSigner } from '../../lib-common/mailerid-sigs/user';
+import { AsyncRNG } from '../../lib-common/rng-def';
 export interface ProvisioningCompletion {
     keyParams: any;
     serverPKey: Uint8Array;
@@ -13,6 +14,7 @@ export interface ProvisioningCompletion {
  * identified by a given uri.
  */
 export declare class MailerIdProvisioner extends ServiceUser {
+    private readonly random;
     private userCert;
     private provCert;
     private midDomain;
@@ -22,7 +24,7 @@ export declare class MailerIdProvisioner extends ServiceUser {
      * @param userId
      * @param uri identifies place of MailerId service.
      */
-    constructor(userId: string, serviceUri: string, net: NetClient);
+    constructor(userId: string, serviceUri: string, net: NetClient, random: AsyncRNG);
     private setUrlAndDomain;
     /**
      * @param pkey is a public key, that needs to be certified.