core-3nweb-client-lib 0.19.5 → 0.20.3

package/build/api-defs/asmail.d.ts

@@ -51,9 +51,9 @@ declare namespace web3n.asmail {
 
 	interface DeliveryOptions {
 		/**
-		 * sendImmeditely flag forces immediate delivery with true value.
+		 * sendImmediately flag forces immediate delivery with true value.
 		 */
-		sendImmeditely?: boolean;
+		sendImmediately?: boolean;
 		/**
 		 * localMeta is an optional data field that is attached to this message's
 		 * delivery progress. This data never leaves local machine and is

package/build/api-defs/web3n.d.ts

@@ -33,7 +33,8 @@ declare namespace web3n {
 	}
 
 	interface EncryptionException {
-		failedCipherVerification: true;
+		failedCipherVerification?: true;
+		failedSignatureVerification?: true;
 	}
 
 	interface AsyncIterator<T> {

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

@@ -156,7 +156,7 @@ class Delivery {
         const msgFS = await this.makeFSForNewMsg(id);
         const msg = await msg_1.Msg.forNew(id, msgFS, msgToSend, sender, recipients, this.r, attachments, localMeta);
         // add and schedule
-        const sendImmediately = (opts ? !!opts.sendImmeditely : false);
+        const sendImmediately = (opts ? !!opts.sendImmediately : false);
         this.addMsgAndSchedule(msg, sendImmediately);
     }
     async makeFSForNewMsg(id) {

package/build/core/index.js

@@ -101,7 +101,7 @@ class Core {
         };
         this.closeBroadcast = new rxjs_1.Subject();
         this.close$ = this.closeBroadcast.asObservable();
-        this.cryptor = makeCryptor(this.logger.logWarning);
+        this.cryptor = makeCryptor(this.logger.logError, this.logger.logWarning);
         this.storages = new storage_1.Storages(this.cryptor.cryptor.sbox, this.appDirs.storagePathFor);
         this.asmail = new asmail_1.ASMail(this.cryptor.cryptor.sbox, this.makeNet, this.appDirs.inboxPathFor, this.logger);
         Object.seal(this);

package/build/core/sign-up.js

@@ -39,21 +39,20 @@ const defaultDerivParams = {
 Object.freeze(defaultDerivParams);
 const SALT_LEN = 32;
 const KEY_ID_LEN = 10;
-function makeLabeledMidLoginKey() {
-    const sk = random.bytesSync(ecma_nacl_1.secret_box.KEY_LENGTH);
+async function makeLabeledMidLoginKey(cryptor) {
+    const sk = await random.bytes(ecma_nacl_1.box.KEY_LENGTH);
     const skey = jwkeys_1.keyToJson({
         k: sk,
         alg: ecma_nacl_1.box.JWK_ALG_NAME,
         use: jwkeys_1.use.MID_PKLOGIN,
-        kid: random.stringOfB64CharsSync(KEY_ID_LEN)
+        kid: await random.stringOfB64Chars(KEY_ID_LEN)
     });
     const pkey = jwkeys_1.keyToJson({
-        k: ecma_nacl_1.box.generate_pubkey(sk),
+        k: await cryptor.box.generate_pubkey(sk),
         alg: skey.alg,
         use: skey.use,
         kid: skey.kid
     });
-    ecma_nacl_1.arrays.wipe(sk);
     return { skey, pkey };
 }
 class SignUp {
@@ -157,7 +156,7 @@ class SignUp {
         };
         const progressCB = sign_in_1.makeKeyGenProgressCB(progressStart, progressEnd, originalProgressCB);
         const defaultPair = await keyDeriv.deriveMidKeyPair(this.cryptor, pass, derivParams, progressCB, jwkeys_1.use.MID_PKLOGIN, '_');
-        const labeledKey = makeLabeledMidLoginKey();
+        const labeledKey = await makeLabeledMidLoginKey(this.cryptor);
         this.mid = {
             defaultSKey: defaultPair.skey,
             labeledSKey: labeledKey.skey,

package/build/ipc-via-protobuf/asmail-cap.js

@@ -69,7 +69,7 @@ function makeASMailCaller(caller, objPath) {
 }
 exports.makeASMailCaller = makeASMailCaller;
 function asmailType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('asmail.proto', `asmail.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('asmail.proto', `asmail.${type}`);
 }
 var getUserId;
 (function (getUserId) {
@@ -336,10 +336,10 @@ var addMsg;
     }
     function wrapService(fn, expServices) {
         return (reqBody) => {
-            const { id, recipients, msg, localMeta, sendImmeditely } = requestType.unpack(reqBody);
+            const { id, recipients, msg, localMeta, sendImmediately } = requestType.unpack(reqBody);
             const promise = fn(protobuf_msg_1.fixArray(recipients), unpackMsg(msg, expServices), id, {
                 localMeta: protobuf_msg_1.valOfOptAny(localMeta),
-                sendImmeditely: protobuf_msg_1.valOfOpt(sendImmeditely)
+                sendImmediately: protobuf_msg_1.valOfOpt(sendImmediately)
             });
             return { promise };
         };
@@ -350,7 +350,7 @@ var addMsg;
         return async (recipients, msg, id, opts) => {
             const req = { id, msg: packMsg(msg, caller), recipients };
             if (opts) {
-                req.sendImmeditely = protobuf_msg_1.toOptVal(opts.sendImmeditely);
+                req.sendImmediately = protobuf_msg_1.toOptVal(opts.sendImmediately);
                 req.localMeta = protobuf_msg_1.toOptAny(opts.localMeta);
             }
             await caller.startPromiseCall(path, requestType.pack(req));

package/build/ipc-via-protobuf/bytes.js

@@ -70,7 +70,7 @@ function exposeSrcService(src, expServices) {
 }
 exports.exposeSrcService = exposeSrcService;
 function bytesType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('bytes.proto', `bytes.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('bytes.proto', `bytes.${type}`);
 }
 var sinkGetSize;
 (function (sinkGetSize) {

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

@@ -35,6 +35,9 @@ class ClientsSideImpl {
         Object.seal(this);
     }
     stop(exc) {
+        if (this.isStopped) {
+            return;
+        }
         this.isStopped = true;
         for (const call of this.fnCalls.values()) {
             if (call.deferred) {

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

@@ -113,7 +113,7 @@ class ServicesSideImpl {
             this.exposedObjs.drop(path[0]);
         }
         else {
-            throw connector_1.makeIPCException({ invalidPath: true });
+            throw connector_1.makeIPCException({ invalidPath: true, path });
         }
     }
     processListObj(fnCallNum, path) {

package/build/ipc-via-protobuf/connector.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Observable, Observer, Subject } from "rxjs";
-import { ProtoType, ObjectReference, ExposedObjType, Value } from "./protobuf-msg";
+import { ObjectReference, ExposedObjType, Value } from "./protobuf-msg";
 export interface ExposedServices {
     exposeDroppableService(objType: ExposedObjType, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference;
     getOriginalObj<T>(ref: ObjectReference): T;
@@ -59,7 +59,7 @@ export declare type EnvelopeBody = Buffer | void;
 export declare type MsgType = ClientToService | ServiceToClient;
 export declare type ClientToService = 'start' | 'cancel' | 'drop' | 'list-obj';
 export declare type ServiceToClient = 'interim' | 'end' | 'error';
-export declare const msgProtoType: ProtoType<Envelope>;
+export declare const msgProtoType: import("../lib-client/protobuf-loader").ProtoType<Envelope>;
 export declare type ExposedFn = (reqBody: EnvelopeBody) => ({
     promise?: Promise<EnvelopeBody>;
     obs?: Observable<EnvelopeBody>;

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

@@ -18,6 +18,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkRefObjTypeIs = exports.makeIPCException = exports.msgProtoType = exports.ensureCorrectRefObjType = exports.W3N_NAME = exports.ObjectsConnector = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
+// Note that make_?_Side functions could've been imported normally, but client
+// side uses weakrefs, while services side doesn't, and services side is used
+// in embedding without weakrefs, needing to hide require points.
 function makeServicesSide(sendMsg) {
     const srvClassFn = require('./connector-services-side').ServicesSideImpl;
     return new srvClassFn(sendMsg);
@@ -168,7 +171,7 @@ function ensureCorrectRefObjType(objType) {
     }
 }
 exports.ensureCorrectRefObjType = ensureCorrectRefObjType;
-exports.msgProtoType = protobuf_msg_1.ProtoType.makeFrom('ipc.proto', 'ipc.Envelope');
+exports.msgProtoType = protobuf_msg_1.makeProtobufTypeFrom('ipc.proto', 'ipc.Envelope');
 function makeIPCException(fields) {
     const exc = {
         runtimeException: true,

package/build/ipc-via-protobuf/file.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
-import { ObjectReference, ProtoType, Value } from "./protobuf-msg";
+import { ObjectReference, Value } from "./protobuf-msg";
 import { ExposedFn, EnvelopeBody, Caller, ExposedServices } from "./connector";
+import { ProtoType } from "../lib-client/protobuf-loader";
 declare type ReadonlyFile = web3n.files.ReadonlyFile;
 declare type ReadonlyFileVersionedAPI = web3n.files.ReadonlyFileVersionedAPI;
 declare type WritableFile = web3n.files.WritableFile;

package/build/ipc-via-protobuf/file.js

@@ -119,7 +119,7 @@ function exposeFileService(file, expServices) {
 }
 exports.exposeFileService = exposeFileService;
 function makeFileType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('file.proto', `file.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('file.proto', `file.${type}`);
 }
 exports.fileMsgType = makeFileType('File');
 const statsMsgType = makeFileType('StatsMsg');

package/build/ipc-via-protobuf/fs.d.ts

@@ -1,6 +1,7 @@
-import { ObjectReference, ProtoType, Value } from "./protobuf-msg";
+import { ObjectReference, Value } from "./protobuf-msg";
 import { Caller, ExposedServices } from "./connector";
 import { FileMsg } from "./file";
+import { ProtoType } from "../lib-client/protobuf-loader";
 declare type FS = web3n.files.FS;
 declare type FSItem = web3n.files.FSItem;
 export declare function makeFSCaller(caller: Caller, fsMsg: FSMsg): FS;

package/build/ipc-via-protobuf/fs.js

@@ -166,7 +166,7 @@ function exposeFSService(fs, expServices) {
 }
 exports.exposeFSService = exposeFSService;
 function makeFSType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('fs.proto', `fs.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('fs.proto', `fs.${type}`);
 }
 exports.fsMsgType = makeFSType('FS');
 var checkPresence;

package/build/ipc-via-protobuf/log-cap.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLogCaller = exports.exposeLogger = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
 function loggerType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('logger.proto', `logger.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('logger.proto', `logger.${type}`);
 }
 const logReqType = loggerType('LogRequestBody');
 function exposeLogger(fn) {

package/build/ipc-via-protobuf/mailerid.js

@@ -34,7 +34,7 @@ function makeMailerIdCaller(caller, objPath) {
 }
 exports.makeMailerIdCaller = makeMailerIdCaller;
 function maileridType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('mailerid.proto', `mailerid.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('mailerid.proto', `mailerid.${type}`);
 }
 var getUserId;
 (function (getUserId) {

package/build/ipc-via-protobuf/proto-defs.js

@@ -79,7 +79,7 @@ message AddMsgRequestBody {
 	repeated string recipients = 1;
 	OutgoingMessageMsg msg = 2;
 	string id = 3;
-	common.BooleanValue send_immeditely = 4;
+	common.BooleanValue send_immediately = 4;
 	common.AnyValue local_meta = 5;
 }
 

package/build/ipc-via-protobuf/protobuf-msg.d.ts

@@ -1,15 +1,8 @@
 /// <reference types="node" />
 import { EnvelopeBody } from './connector';
+import { ProtoType } from '../lib-client/protobuf-loader';
 declare type RuntimeException = web3n.RuntimeException;
-export declare class ProtoType<T extends object> {
-    private type;
-    private constructor();
-    static makeFrom<T extends object>(protoFile: string, typeName: string): ProtoType<T>;
-    pack(msg: T): Buffer;
-    unpack(bytes: Buffer | void): T;
-    packToBase64(msg: T): string;
-    unpackFromBase64(str: string): T;
-}
+export declare function makeProtobufTypeFrom<T extends object>(protoFile: string, typeName: string): ProtoType<T>;
 export declare type ExposedObjType = 'FileByteSink' | 'FileByteSource' | 'FileImpl' | 'FSImpl' | 'SymLinkImpl' | 'FSCollection' | 'FSItemsIter';
 export interface ObjectReference {
     objType: ExposedObjType;

package/build/ipc-via-protobuf/protobuf-msg.js

@@ -16,83 +16,26 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valOfOptAny = exports.toOptAny = exports.toOptJson = exports.valOfOptJson = exports.valOfOpt = exports.valOf = exports.toOptVal = exports.toVal = exports.errFromMsg = exports.errToMsg = exports.errBodyType = exports.unpackInt = exports.packInt = exports.valOfOptInt = exports.fixInt = exports.fixArray = exports.strArrValType = exports.boolValType = exports.objRefType = exports.ProtoType = void 0;
-const protobuf = require("protobufjs");
-const path_1 = require("path");
+exports.valOfOptAny = exports.toOptAny = exports.toOptJson = exports.valOfOptJson = exports.valOfOpt = exports.valOf = exports.toOptVal = exports.toVal = exports.errFromMsg = exports.errToMsg = exports.errBodyType = exports.unpackInt = exports.packInt = exports.valOfOptInt = exports.fixInt = exports.fixArray = exports.strArrValType = exports.boolValType = exports.objRefType = exports.makeProtobufTypeFrom = void 0;
 const connector_1 = require("./connector");
 const error_1 = require("../lib-common/exceptions/error");
-const fs = require("fs");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
-class ProtoType {
-    constructor(type) {
-        this.type = type;
-        Object.freeze(this);
-    }
-    static makeFrom(protoFile, typeName) {
-        const root = loadRoot(protoFile);
-        const type = root.lookupType(typeName);
-        return new ProtoType(type);
-    }
-    pack(msg) {
-        const err = this.type.verify(msg);
-        if (err) {
-            throw new Error(err);
-        }
-        return this.type.encode(msg).finish();
+const protobuf_loader_1 = require("../lib-client/protobuf-loader");
+function makeProtobufTypeFrom(protoFile, typeName) {
+    try {
+        // make sure to copy protos with compile step (use npm script)
+        return protobuf_loader_1.ProtoType.makeFrom(__dirname, protoFile, typeName);
     }
-    unpack(bytes) {
-        if (!bytes) {
-            throw connector_1.makeIPCException({ missingBodyBytes: true });
-        }
-        return this.type.decode(bytes);
-    }
-    packToBase64(msg) {
-        return this.pack(msg).toString('base64');
-    }
-    unpackFromBase64(str) {
-        return this.unpack(Buffer.from(str, 'base64'));
-    }
-}
-exports.ProtoType = ProtoType;
-Object.freeze(ProtoType.prototype);
-Object.freeze(ProtoType);
-// make sure to copy protos with compile step (use npm script)
-const protosDir = path_1.resolve(__dirname, './protos');
-const roots = new Map();
-function loadRoot(fileName) {
-    let root = roots.get(fileName);
-    if (!root) {
-        // if proto files file, we try to get definitions from the module
-        try {
-            root = protobuf.loadSync(path_1.join(protosDir, fileName));
-        }
-        catch (err) {
-            // make sure to generate proto-defs with compile step (use npm script)
-            const protos = require('./proto-defs').protos;
-            if (!protos || (typeof protos !== 'object')) {
-                throw new Error(`proto-defs doesn't have expected object`);
-            }
-            const initFunc = fs.readFileSync;
-            try {
-                fs.readFileSync = (fName) => {
-                    const protoDefsStr = protos[fName];
-                    if (!protoDefsStr) {
-                        throw new Error(`Don't have in module proto definition for ${fName}`);
-                    }
-                    return Buffer.from(protoDefsStr, 'utf8');
-                };
-                root = protobuf.loadSync(fileName);
-            }
-            finally {
-                fs.readFileSync = initFunc;
-            }
-        }
-        roots.set(fileName, root);
+    catch (err) {
+        // we won't get here if referenced  module exists, but metro packager
+        // in LiqudCore needs static path require
+        const fallback = require('./proto-defs');
+        return protobuf_loader_1.ProtoType.makeFrom(__dirname, protoFile, typeName, fallback);
     }
-    return root;
 }
+exports.makeProtobufTypeFrom = makeProtobufTypeFrom;
 function commonType(type) {
-    return ProtoType.makeFrom('common.proto', `common.${type}`);
+    return makeProtobufTypeFrom('common.proto', `common.${type}`);
 }
 exports.objRefType = commonType('ObjectReference');
 exports.boolValType = commonType('BooleanValue');

package/build/ipc-via-protobuf/protos/asmail.proto

@@ -77,7 +77,7 @@ message AddMsgRequestBody {
 	repeated string recipients = 1;
 	OutgoingMessageMsg msg = 2;
 	string id = 3;
-	common.BooleanValue send_immeditely = 4;
+	common.BooleanValue send_immediately = 4;
 	common.AnyValue local_meta = 5;
 }
 

package/build/ipc-via-protobuf/startup-cap.js

@@ -58,7 +58,7 @@ function makeSignUpCaller(caller, objPath) {
 }
 exports.makeSignUpCaller = makeSignUpCaller;
 function startupType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('startup.proto', `startup.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('startup.proto', `startup.${type}`);
 }
 var getAvailableAddresses;
 (function (getAvailableAddresses) {

package/build/ipc-via-protobuf/storage-cap.js

@@ -51,7 +51,7 @@ function makeStorageCaller(caller, objPath) {
 }
 exports.makeStorageCaller = makeStorageCaller;
 function storageType(type) {
-    return protobuf_msg_1.ProtoType.makeFrom('storage.proto', `storage.${type}`);
+    return protobuf_msg_1.makeProtobufTypeFrom('storage.proto', `storage.${type}`);
 }
 var getAppLocalFS;
 (function (getAppLocalFS) {

package/build/lib-client/cryptor/cryptor-in-worker.d.ts

@@ -1,6 +1,20 @@
-import { Cryptor } from './cryptor';
-import { LogWarning } from '../logging/log-to-file';
-export declare function makeInWorkerCryptor(logWarning: LogWarning, maxThreads: number | undefined): {
-    cryptor: Cryptor;
-    close: () => void;
+import { makeCryptor } from './cryptor';
+export interface RequestMsg {
+    func: Func;
+    args: any[];
+}
+export declare type Func = 'scrypt' | 'box.calc_dhshared_key' | 'box.generate_pubkey' | 'sbox.open' | 'sbox.pack' | 'sbox.formatWN.open' | 'sbox.formatWN.pack' | 'sign.generate_keypair' | 'sign.signature' | 'sign.verify';
+export interface ReplyMsg {
+    res?: any;
+    interim?: any;
+    err?: any;
+}
+export declare type Code = (args: any[]) => {
+    res: any;
+    trans?: ArrayBuffer[];
 };
+export interface WorkerData {
+    loadDir: string;
+}
+export declare const makeInWorkerCryptor: makeCryptor;
+export declare const makeInWorkerWasmCryptor: makeCryptor;