core-3nweb-client-lib 0.22.1 → 0.24.1

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2021 3NSoft Inc.
+ Copyright (C) 2021 - 2022 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
@@ -20,7 +20,8 @@ exports.makeInProcessWasmCryptor = void 0;
 const wasm_mp1_modules_1 = require("./wasm-mp1-modules");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const protobuf_loader_1 = require("../protobuf-loader");
+const protobuf_type_1 = require("../protobuf-type");
+const cryptor_proto_1 = require("../../protos/cryptor.proto");
 const processes_1 = require("../../lib-common/processes");
 const assert_1 = require("../../lib-common/assert");
 const error_1 = require("../../lib-common/exceptions/error");
@@ -45,20 +46,6 @@ function wasmBytes() {
         return Buffer.from(str, 'base64');
     }
 }
-function makeProtobufType(type) {
-    const protoFile = 'cryptor.proto';
-    const typeName = `cryptor.${type}`;
-    try {
-        // make sure to copy protos with compile step (use npm script)
-        return protobuf_loader_1.ProtoType.makeFrom(__dirname, protoFile, typeName);
-    }
-    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);
-    }
-}
 function toArgs(...args) {
     return args.map(val => ({ val }));
 }
@@ -73,10 +60,10 @@ function toLocalErr(replyErr) {
         return new Error(`WASM cryptor ${replyErr.condition}: ${replyErr.message}`);
     }
 }
-const reqType = makeProtobufType('Request');
-const replyType = makeProtobufType('Reply');
-const boolValType = makeProtobufType('BoolVal');
-const kpairType = makeProtobufType('Keypair');
+const reqType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Request);
+const replyType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Reply);
+const boolValType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.BoolVal);
+const kpairType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Keypair);
 function makeInProcessWasmCryptor() {
     const wasmInstance = wasm_mp1_modules_1.startWasmFrom(wasmBytes());
     let deferred = undefined;

package/build/lib-client/{protobuf-loader.d.ts → protobuf-type.d.ts}

@@ -1,10 +1,8 @@
 /// <reference types="node" />
 export declare class ProtoType<T extends object> {
-    private type;
+    private readonly type;
     private constructor();
-    static makeFrom<T extends object>(searchDir: string, protoFile: string, typeName: string, fallbackMod?: {
-        protos: object;
-    }): ProtoType<T>;
+    static for<T extends object>(type: any): ProtoType<T>;
     pack(msg: T): Buffer;
     unpack(bytes: Buffer | void): T;
     packToBase64(msg: T): string;

package/build/lib-client/{protobuf-loader.js → protobuf-type.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2021 3NSoft Inc.
+ Copyright (C) 2020 - 2022 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
@@ -17,17 +17,13 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProtoType = void 0;
-const protobuf = require("protobufjs");
-const path_1 = require("path");
-const fs = require("fs");
 class ProtoType {
     constructor(type) {
+        this.type = type;
         this.type = type;
         Object.freeze(this);
     }
-    static makeFrom(searchDir, protoFile, typeName, fallbackMod) {
-        const root = loadRoot(searchDir, protoFile, fallbackMod);
-        const type = root.lookupType(typeName);
+    static for(type) {
         return new ProtoType(type);
     }
     pack(msg) {
@@ -57,40 +53,4 @@ class ProtoType {
 exports.ProtoType = ProtoType;
 Object.freeze(ProtoType.prototype);
 Object.freeze(ProtoType);
-const roots = new Map();
-function loadRoot(searchDir, fileName, fallbackMod) {
-    const filePath = path_1.resolve(searchDir, 'protos', fileName);
-    let root = roots.get(filePath);
-    if (!root) {
-        // if proto files file, we try to get definitions from the module
-        try {
-            root = protobuf.loadSync(filePath);
-        }
-        catch (err) {
-            if (!fallbackMod) {
-                throw err;
-            }
-            const protos = fallbackMod.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(filePath, root);
-    }
-    return root;
-}
 Object.freeze(exports);

package/build/lib-index.d.ts

@@ -1,4 +1,3 @@
-/// <reference path="api-defs/web3n.d.ts" />
 export * from "./core-ipc/common-caps";
 export * from "./core-ipc/startup-caps";
 export * from "./ipc-via-protobuf/connector";