core-3nweb-client-lib 0.20.0 → 0.20.4

package/build/lib-client/cryptor/in-proc-wasm.js

@@ -24,16 +24,6 @@ const protobuf_loader_1 = require("../protobuf-loader");
 const processes_1 = require("../../lib-common/processes");
 const assert_1 = require("../../lib-common/assert");
 const error_1 = require("../../lib-common/exceptions/error");
-function inNextTick(f) {
-    return new Promise((resolve, reject) => process.nextTick(() => {
-        try {
-            resolve(f());
-        }
-        catch (err) {
-            reject(err);
-        }
-    }));
-}
 function wasmBytes() {
     // There is a bug with electrons 12, 13, that doesn't let
     // worker_thread read this file from asar pack, even though main thread
@@ -45,7 +35,15 @@ function wasmBytes() {
     const dirWithThis = ((asarInd < 0) ?
         __dirname : `${__dirname.substring(0, asarInd + 8)}.unpacked${__dirname.substring(asarInd + 8)}`);
     const wasmPath = path_1.join(dirWithThis, 'cryptor.wasm');
-    return fs_1.readFileSync(wasmPath);
+    try {
+        return fs_1.readFileSync(wasmPath);
+    }
+    catch (err) {
+        // chances are that error is due to wasm file not being packaged, so, we
+        // look for module with base64 form in a module, that must've been packed
+        const str = require('./cryptor-wasm.js').wasm;
+        return Buffer.from(str, 'base64');
+    }
 }
 function makeProtobufType(type) {
     const protoFile = 'cryptor.proto';
@@ -57,8 +55,8 @@ function makeProtobufType(type) {
     catch (err) {
         // we won't get here if referenced  module exists, but metro packager
         // in LiqudCore needs static path require
-        require('./proto-defs');
-        return protobuf_loader_1.ProtoType.makeFrom(__dirname, protoFile, typeName);
+        const fallback = require('./proto-defs');
+        return protobuf_loader_1.ProtoType.makeFrom(__dirname, protoFile, typeName, fallback);
     }
 }
 function toArgs(...args) {
@@ -83,9 +81,16 @@ function makeInProcessWasmCryptor() {
     const wasmInstance = wasm_mp1_modules_1.startWasmFrom(wasmBytes());
     let deferred = undefined;
     let interimSink = undefined;
-    function call(req, interim) {
+    async function call(req, interim) {
+        // In LiquidCore on iOS call was able to get before completion of
+        // previous call, therefore, the following await loop is needed.
+        while (!!deferred) {
+            try {
+                await deferred.promise;
+            }
+            catch (err) { }
+        }
         deferred = processes_1.defer();
-        const promise = deferred.promise;
         if (interim) {
             interimSink = interim;
         }
@@ -97,7 +102,7 @@ function makeInProcessWasmCryptor() {
                 deferred === null || deferred === void 0 ? void 0 : deferred.reject(err);
             }
         });
-        return promise;
+        return deferred.promise;
     }
     wasmInstance.setMsgListener(msg => {
         assert_1.assert(!!deferred, `Deferred is expected to be available for this output from wasm`);

package/build/lib-client/protobuf-loader.d.ts

@@ -2,7 +2,9 @@
 export declare class ProtoType<T extends object> {
     private type;
     private constructor();
-    static makeFrom<T extends object>(searchDir: string, protoFile: string, typeName: string): ProtoType<T>;
+    static makeFrom<T extends object>(searchDir: string, protoFile: string, typeName: string, fallbackMod?: {
+        protos: object;
+    }): ProtoType<T>;
     pack(msg: T): Buffer;
     unpack(bytes: Buffer | void): T;
     packToBase64(msg: T): string;

package/build/lib-client/protobuf-loader.js

@@ -25,8 +25,8 @@ class ProtoType {
         this.type = type;
         Object.freeze(this);
     }
-    static makeFrom(searchDir, protoFile, typeName) {
-        const root = loadRoot(searchDir, protoFile);
+    static makeFrom(searchDir, protoFile, typeName, fallbackMod) {
+        const root = loadRoot(searchDir, protoFile, fallbackMod);
         const type = root.lookupType(typeName);
         return new ProtoType(type);
     }
@@ -58,7 +58,7 @@ exports.ProtoType = ProtoType;
 Object.freeze(ProtoType.prototype);
 Object.freeze(ProtoType);
 const roots = new Map();
-function loadRoot(searchDir, fileName) {
+function loadRoot(searchDir, fileName, fallbackMod) {
     const filePath = path_1.resolve(searchDir, 'protos', fileName);
     let root = roots.get(filePath);
     if (!root) {
@@ -67,9 +67,10 @@ function loadRoot(searchDir, fileName) {
             root = protobuf.loadSync(filePath);
         }
         catch (err) {
-            // make sure to generate proto-defs with compile step (use npm script)
-            const fallbackMod = path_1.join(path_1.relative(__dirname, searchDir), 'proto-defs');
-            const protos = require(fallbackMod).protos;
+            if (!fallbackMod) {
+                throw err;
+            }
+            const protos = fallbackMod.protos;
             if (!protos || (typeof protos !== 'object')) {
                 throw new Error(`proto-defs doesn't have expected object`);
             }

package/package.json

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

package/wasm-parts/cryptor/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "cryptor"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-wasm-bindgen = "0.2.78"
-nacl = "0.5.3"
-wasm-message-passing-3nweb = "0.2.0"
-prost = "0.9.0"
-
-[build-dependencies]
-prost-build = "0.9.0"

package/wasm-parts/cryptor/build.rs

@@ -1,29 +0,0 @@
-use std::io::Result;
-use std::fs::{read_dir};
-
-const PROTOS_DIR: &str = "./protos";
-
-fn main() -> Result<()> {
-	let proto_file_paths: Vec<_> = read_dir(PROTOS_DIR)?
-	.filter_map(|res| {
-		if res.is_ok() {
-			res.ok()
-		} else {
-			eprintln!("Path Listing error: {}", res.err().unwrap());
-			None
-		}
-	})
-	.filter(|entry| {
-		let f_type_res = entry.file_type();
-		if f_type_res.is_ok() {
-			f_type_res.ok().unwrap().is_file()
-		} else {
-			eprintln!("Path Listing error: {}", f_type_res.err().unwrap());
-			false
-		}
-	})
-	.map(|file_entry| file_entry.path())
-	.collect();
-	prost_build::compile_protos(&proto_file_paths, &[PROTOS_DIR])?;
-	Ok(())
-}

package/wasm-parts/cryptor/protos/cryptor.proto

@@ -1,45 +0,0 @@
-syntax = "proto3";
-
-package cryptor;
-
-message Request {
-
-	message ScryptArgs {
-		bytes passwd = 1;
-		bytes salt = 2;
-		uint32 logN = 3;
-		uint32 r = 4;
-		uint32 p = 5;
-		uint32 dkLen = 6;
-	}
-	
-	uint32 func = 1;
-	repeated BytesVal byte_args = 2;
-	ScryptArgs scrypt_args = 3;
-
-}
-
-message BytesVal {
-	bytes val = 1;
-}
-
-message Reply {
-
-	message Error {
-		string condition = 1;
-		string message = 2;
-	}
-
-	BytesVal res = 1;
-	BytesVal interim = 2;
-	Error err = 3;
-}
-
-message BoolVal {
-	bool val = 1;
-}
-
-message Keypair {
-	bytes skey = 1;
-	bytes pkey = 2;
-}

package/wasm-parts/cryptor/src/lib.rs

@@ -1,131 +0,0 @@
-// Copyright(c) 2021 3NSoft Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-mod pb;
-
-use wasm_bindgen::prelude::*;
-use wasm_message_passing_3nweb::wasm_mp1::{ send_msg_out, set_msg_processor };
-use pb::cryptor::{ Request, Reply, Keypair, request, BytesVal, BoolVal, reply };
-use prost::Message;
-use prost::bytes::Bytes;
-use nacl::{ secret_box as sbox, public_box as pbox, scrypt, sign, Error, ErrorCondition };
-
-#[wasm_bindgen]
-pub fn _start() -> () {
-	set_msg_processor(&process_nacl_call);
-}
-
-fn process_nacl_call(msg: Vec<u8>) -> () {
-	let req = match Request::decode(Bytes::from(msg)) {
-		Ok(r) => r,
-		Err(err) => {
-			send_error(reply::Error {
-				condition: "message-passing-error".to_string(),
-				message: format!("{}", err)
-			});
-			return;
-		}
-	};
-
-	let reply = match req.func {
-		1 => {
-			let request::ScryptArgs {
-				passwd, salt, log_n, r, p, dk_len
-			} = req.scrypt_args.unwrap();
-			let progress_cb = |p: u32| send_msg_out(& pack_interim(vec!(p as u8)));
-			scrypt(&passwd, &salt,
-				log_n as u8, r as usize, p as usize, dk_len as usize, & progress_cb)
-		},
-		2 => pbox::calc_dhshared_key(arg(&req, 0), arg(&req, 1)),
-		3 => pbox::generate_pubkey(arg(&req, 0)),
-		4 => sbox::open(arg(&req, 0), arg(&req, 1), arg(&req, 2)),
-		5 => sbox::pack(arg(&req, 0), arg(&req, 1), arg(&req, 2)),
-		6 => sbox::format_wn::open(arg(&req, 0), arg(&req, 1)),
-		7 => sbox::format_wn::pack(
-			arg(&req, 0), arg(&req, 1), arg(&req, 2)),
-		8 => {
-			let sign::Keypair{ skey, pkey } =
-				sign::generate_keypair(arg(&req, 0));
-			let bytes = Keypair {
-				skey: skey.to_vec(), pkey: pkey.to_vec()
-			}.encode_to_vec();
-			Ok(bytes)
-		},
-		9 => sign::signature(arg(&req, 0), arg(&req, 1)),
-		10 => match sign::verify(
-			arg(&req, 0), arg(&req, 1), arg(&req, 2)
-		) {
-			Ok(b) => Ok(BoolVal { val: b }.encode_to_vec()),
-			Err(err) => Err(err)
-		},
-		fnum => {
-			send_error(reply::Error {
-				condition: "message-passing-error".to_string(),
-				message: format!("Unrecognized func number {}", fnum)
-			});
-			return;
-		}
-	};
-
-	let reply_msg = match reply {
-		Ok(res) => pack_ok(res),
-		Err(err) => pack_err(nacl_err_to_msg(err)),
-	};
-
-	send_msg_out(&reply_msg);
-}
-
-fn arg(req: &Request, i: usize) -> &[u8] {
-	req.byte_args[i].val.as_slice()
-}
-
-fn pack_bytes(bytes: Vec<u8>) -> Option<BytesVal> {
-	Some(BytesVal {
-		val: bytes
-	})
-}
-
-fn pack_ok(bytes: Vec<u8>) -> Vec<u8> {
-	Reply {
-		res: pack_bytes(bytes), interim: None, err: None
-	}.encode_to_vec()
-}
-
-fn pack_interim(bytes: Vec<u8>) -> Vec<u8> {
-	Reply {
-		res: None, interim: pack_bytes(bytes), err: None
-	}.encode_to_vec()
-}
-
-fn nacl_err_to_msg(err: Error) -> reply::Error {
-	reply::Error {
-		condition: match err.condition {
-			ErrorCondition::CipherVerification => "cipher-verification",
-			ErrorCondition::SignatureVerification => "signature-verification",
-			ErrorCondition::Configuration => "configuration-error",
-		}.to_string(),
-		message: err.message,
-	}
-}
-
-fn pack_err(err: reply::Error) -> Vec<u8> {
-	Reply {
-		res: None, interim: None, err: Some(err)
-	}.encode_to_vec()
-}
-
-fn send_error(err: reply::Error) -> () {
-	send_msg_out(& pack_err(err));
-}

package/wasm-parts/cryptor/src/pb.rs

@@ -1,27 +0,0 @@
-// Copyright(c) 2021 3NSoft Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-macro_rules! modules_with_pb_objects {
-	( $( $mod_name: ident ), * ) => {
-		$(pub mod $mod_name {
-			include!(concat!(env!("OUT_DIR"), "/", stringify!($mod_name), ".rs"));
-		})*
-	}
-}
-
-modules_with_pb_objects!( 
-	cryptor
-);

package/wasm-parts/cryptor/test.js

@@ -1,49 +0,0 @@
-
-const fs = require('fs');
-
-const mod = new WebAssembly.Module(fs.readFileSync('./pkg/cryptor_bg.wasm'));
-
-function msgFromWASM(ptr, len) {
-	console.log(`Invoked _3nweb_mp1_send_out_msg(ptr = ${ptr}, len = ${len})`);
-	const msgInBuf = new Uint8Array(instance.exports.memory.buffer, ptr, len);
-	replyFromWasm = new Uint8Array(msgInBuf.length);
-	replyFromWasm.set(msgInBuf);
-	console.log(`Reply from WASM is`, replyFromWasm);
-}
-
-let replyFromWasm;
-
-const imports = {
-	env: {
-		_3nweb_mp1_send_out_msg: msgFromWASM,
-	}
-};
-
-const instance = new WebAssembly.Instance(mod, imports);
-console.log(`WASM instance has following exports:`, instance.exports);
-
-console.log(`\nStarting instance`);
-instance.exports._start();
-
-function test(msg) {
-	console.log(`Sending message to WASM`);
-
-	console.log(`Getting buffer for message length`, msg.length);
-
-	let ptr = instance.exports._3nweb_mp1_get_buffer(msg.length);
-	console.log(`Pointer is`, ptr);
-
-	let buf = new Uint8Array(instance.exports.memory.buffer, ptr, msg.length);
-	buf.set(msg);
-	console.log(`Message is placed into buffer`, buf);
-
-	console.log(`Telling WASM instance to process message`);
-	instance.exports._3nweb_mp1_accept_msg(msg.length);
-}
-
-console.log(`\nTest 1`);
-test(new Uint8Array([1,2,3,4,5,6,7,8,9,10]));
-for (let i of [2,3,4]) {
-	console.log(`\nTest ${i}`);
-	test(replyFromWasm);
-}