core-3nweb-client-lib 0.20.1 → 0.20.5

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
@@ -65,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) {
@@ -91,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;
         }
@@ -105,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.1",
+  "version": "0.20.5",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",