core-3nweb-client-lib 0.24.0 → 0.24.3

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 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
@@ -18,6 +18,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fsItem = exports.fsMsgType = exports.exposeFSService = exports.makeFSCaller = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const fs_proto_1 = require("../protos/fs.proto");
 const connector_1 = require("./connector");
 const file_1 = require("./file");
 const file = require("./file");
@@ -165,13 +167,10 @@ function exposeFSService(fs, expServices) {
     return fsMsg;
 }
 exports.exposeFSService = exposeFSService;
-function makeFSType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('fs.proto', `fs.${type}`);
-}
-exports.fsMsgType = makeFSType('FS');
+exports.fsMsgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FS);
 var checkPresence;
 (function (checkPresence) {
-    const requestType = makeFSType('CheckPresenceRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.CheckPresenceRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, throwIfMissing } = requestType.unpack(buf);
@@ -202,7 +201,7 @@ var checkPresence;
     checkPresence.makeLinkCaller = makeLinkCaller;
 })(checkPresence || (checkPresence = {}));
 Object.freeze(checkPresence);
-const reqWithPathType = makeFSType('PathOnlyRequestBody');
+const reqWithPathType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.PathOnlyRequestBody);
 var stat;
 (function (stat) {
     function wrapService(fn) {
@@ -225,7 +224,7 @@ var stat;
 Object.freeze(stat);
 var getXAttr;
 (function (getXAttr) {
-    getXAttr.requestType = makeFSType('GetXAttrRequestBody');
+    getXAttr.requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.GetXAttrRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, xaName } = getXAttr.requestType.unpack(buf);
@@ -264,8 +263,8 @@ var listXAttrs;
     listXAttrs.makeCaller = makeCaller;
 })(listXAttrs || (listXAttrs = {}));
 Object.freeze(listXAttrs);
-const symLinkMsgType = makeFSType('SymLink');
-const symLinkTargetType = makeFSType('SymLinkTargetReplyBody');
+const symLinkMsgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.SymLink);
+const symLinkTargetType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.SymLinkTargetReplyBody);
 function exposeSymLink(link, expServices) {
     const exp = () => {
         if (link.isFile) {
@@ -346,7 +345,7 @@ var readLink;
     readLink.makeCaller = makeCaller;
 })(readLink || (readLink = {}));
 Object.freeze(readLink);
-const fsEventMsgType = makeFSType('FSEventMsg');
+const fsEventMsgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSEventMsg);
 function packFSEvent(e) {
     const m = {
         type: e.type,
@@ -487,7 +486,7 @@ var readonlySubRoot;
 Object.freeze(readonlySubRoot);
 var listFolder;
 (function (listFolder) {
-    const requestType = makeFSType('ListFolderReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ListFolderReplyBody);
     function wrapService(fn) {
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
@@ -548,7 +547,7 @@ var readTxtFile;
 Object.freeze(readTxtFile);
 var readBytes;
 (function (readBytes) {
-    readBytes.requestType = makeFSType('ReadBytesRequestBody');
+    readBytes.requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ReadBytesRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, start, end } = readBytes.requestType.unpack(buf);
@@ -623,7 +622,7 @@ var readonlyFile;
 Object.freeze(readonlyFile);
 var select;
 (function (select) {
-    const requestType = makeFSType('SelectRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.SelectRequestBody);
     function criteriaToMsg(sc) {
         const c = {
             action: sc.action,
@@ -751,8 +750,8 @@ var fsCollection;
     fsCollection.makeCollectionCaller = makeCollectionCaller;
     let get;
     (function (get) {
-        const requestType = makeFSType('FSCGetRequestBody');
-        const replyType = makeFSType('FSCGetReplyBody');
+        const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSCGetRequestBody);
+        const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSCGetReplyBody);
         function wrapService(fn, expServices) {
             return buf => {
                 const { name } = requestType.unpack(buf);
@@ -780,7 +779,7 @@ var fsCollection;
     Object.freeze(get);
     let getAll;
     (function (getAll) {
-        const replyType = makeFSType('FSCGetAllReplyBody');
+        const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSCGetAllReplyBody);
         function wrapService(fn, expServices) {
             return buf => {
                 const promise = fn()
@@ -831,7 +830,7 @@ var fsCollection;
             caller.registerClientDrop(iter, ref);
             return iter;
         }
-        const iterResMsgType = makeFSType('IterResMsg');
+        const iterResMsgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.IterResMsg);
         function packIterRes(res, expServices) {
             let msg;
             if (res.done) {
@@ -892,7 +891,7 @@ var fsCollection;
     Object.freeze(entries);
     let watch;
     (function (watch) {
-        const eventType = makeFSType('CollectionEvent');
+        const eventType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.CollectionEvent);
         function wrapService(fn, expServices) {
             return () => {
                 const s = new rxjs_1.Subject();
@@ -947,7 +946,7 @@ var fsCollection;
 Object.freeze(fsCollection);
 var fsItem;
 (function (fsItem) {
-    fsItem.msgType = makeFSType('FSItem');
+    fsItem.msgType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.FSItem);
     function exposeFSItem(expServices, item) {
         const msg = {
             isLink: protobuf_msg_1.toOptVal(item.isLink)
@@ -1073,7 +1072,7 @@ var vListXAttrs;
 Object.freeze(vListXAttrs);
 var vListFolder;
 (function (vListFolder) {
-    const replyType = makeFSType('VersionedListFolderReplyBody');
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedListFolderReplyBody);
     function wrapService(fn) {
         return buf => {
             const { path } = reqWithPathType.unpack(buf);
@@ -1199,7 +1198,7 @@ var vGetByteSource;
 Object.freeze(vGetByteSource);
 var updateXAttrs;
 (function (updateXAttrs) {
-    const requestType = makeFSType('UpdateXAttrsRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.UpdateXAttrsRequestBody);
     function unpackRequest(buf) {
         const { changes, path } = requestType.unpack(buf);
         return { path, changes: file.updateXAttrs.fromReqChanges(changes) };
@@ -1227,7 +1226,7 @@ var updateXAttrs;
 Object.freeze(updateXAttrs);
 var makeFolder;
 (function (makeFolder) {
-    const requestType = makeFSType('MakeFolderRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MakeFolderRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, exclusive } = requestType.unpack(buf);
@@ -1248,7 +1247,7 @@ var makeFolder;
 Object.freeze(makeFolder);
 var deleteFolder;
 (function (deleteFolder) {
-    const requestType = makeFSType('DeleteFolderRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DeleteFolderRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, removeContent } = requestType.unpack(buf);
@@ -1305,7 +1304,7 @@ var deleteLink;
 Object.freeze(deleteLink);
 var move;
 (function (move) {
-    const requestType = makeFSType('MoveRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MoveRequestBody);
     function wrapService(fn) {
         return buf => {
             const { src, dst } = requestType.unpack(buf);
@@ -1324,7 +1323,7 @@ var move;
 Object.freeze(move);
 var copyFile;
 (function (copyFile) {
-    const requestType = makeFSType('CopyFileRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.CopyFileRequestBody);
     function wrapService(fn) {
         return buf => {
             const { src, dst, overwrite } = requestType.unpack(buf);
@@ -1345,7 +1344,7 @@ var copyFile;
 Object.freeze(copyFile);
 var copyFolder;
 (function (copyFolder) {
-    const requestType = makeFSType('CopyFolderRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.CopyFolderRequestBody);
     function wrapService(fn) {
         return buf => {
             const { src, dst, mergeAndOverwrite } = requestType.unpack(buf);
@@ -1366,7 +1365,7 @@ var copyFolder;
 Object.freeze(copyFolder);
 var saveFile;
 (function (saveFile) {
-    const requestType = makeFSType('SaveFileRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.SaveFileRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { dst, file, overwrite } = requestType.unpack(buf);
@@ -1388,7 +1387,7 @@ var saveFile;
 Object.freeze(saveFile);
 var saveFolder;
 (function (saveFolder) {
-    const requestType = makeFSType('SaveFolderRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.SaveFolderRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { dst, folder: file, overwrite } = requestType.unpack(buf);
@@ -1410,7 +1409,7 @@ var saveFolder;
 Object.freeze(saveFolder);
 var link;
 (function (link) {
-    const requestType = makeFSType('LinkRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.LinkRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { path, target } = requestType.unpack(buf);
@@ -1428,7 +1427,7 @@ var link;
     link.makeCaller = makeCaller;
 })(link || (link = {}));
 Object.freeze(link);
-const pathAndFileOptsType = makeFSType('PathAndOptFileFlags');
+const pathAndFileOptsType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.PathAndOptFileFlags);
 function packPathAndFlags(path, flags) {
     return pathAndFileOptsType.pack({ path, flags: optFlagsToMsg(flags) });
 }
@@ -1504,7 +1503,7 @@ var writableFile;
 Object.freeze(writableFile);
 var writeJSONFile;
 (function (writeJSONFile) {
-    const requestType = makeFSType('WriteJsonFileRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.WriteJsonFileRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, json, flags } = requestType.unpack(buf);
@@ -1525,7 +1524,7 @@ var writeJSONFile;
 Object.freeze(writeJSONFile);
 var writeTxtFile;
 (function (writeTxtFile) {
-    const requestType = makeFSType('WriteTxtFileRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.WriteTxtFileRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, txt, flags } = requestType.unpack(buf);
@@ -1546,7 +1545,7 @@ var writeTxtFile;
 Object.freeze(writeTxtFile);
 var writeBytes;
 (function (writeBytes) {
-    const requestType = makeFSType('WriteBytesRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.WriteBytesRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, bytes, flags } = requestType.unpack(buf);
@@ -1631,7 +1630,7 @@ function optVerFlagsFromMsg(m) {
 }
 var vWriteJSONFile;
 (function (vWriteJSONFile) {
-    const requestType = makeFSType('VersionedWriteJsonFileRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedWriteJsonFileRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, json, flags } = requestType.unpack(buf);
@@ -1654,7 +1653,7 @@ var vWriteJSONFile;
 Object.freeze(vWriteJSONFile);
 var vWriteTxtFile;
 (function (vWriteTxtFile) {
-    const requestType = makeFSType('VersionedWriteTxtFileRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedWriteTxtFileRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, txt, flags } = requestType.unpack(buf);
@@ -1677,7 +1676,7 @@ var vWriteTxtFile;
 Object.freeze(vWriteTxtFile);
 var vWriteBytes;
 (function (vWriteBytes) {
-    const requestType = makeFSType('VersionedWriteBytesRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedWriteBytesRequestBody);
     function wrapService(fn) {
         return buf => {
             const { path, bytes, flags } = requestType.unpack(buf);
@@ -1702,7 +1701,7 @@ var vWriteBytes;
 Object.freeze(vWriteBytes);
 var vGetByteSink;
 (function (vGetByteSink) {
-    const requestType = makeFSType('VersionedGetByteSinkRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedGetByteSinkRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { path, flags } = requestType.unpack(buf);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 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
@@ -18,10 +18,9 @@
 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.makeProtobufTypeFrom('logger.proto', `logger.${type}`);
-}
-const logReqType = loggerType('LogRequestBody');
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const logger_proto_1 = require("../protos/logger.proto");
+const logReqType = protobuf_type_1.ProtoType.for(logger_proto_1.logger.LogRequestBody);
 function exposeLogger(fn) {
     return buf => {
         const { logType, msg, err } = logReqType.unpack(buf);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 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
@@ -18,7 +18,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMailerIdCaller = exports.exposeMailerIdCAP = void 0;
 const connector_1 = require("./connector");
-const protobuf_msg_1 = require("./protobuf-msg");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const mailerid_proto_1 = require("../protos/mailerid.proto");
 function exposeMailerIdCAP(cap) {
     return {
         getUserId: getUserId.wrapService(cap.getUserId),
@@ -33,9 +34,6 @@ function makeMailerIdCaller(caller, objPath) {
     };
 }
 exports.makeMailerIdCaller = makeMailerIdCaller;
-function maileridType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('mailerid.proto', `mailerid.${type}`);
-}
 var getUserId;
 (function (getUserId) {
     function wrapService(fn) {
@@ -61,8 +59,8 @@ var getUserId;
 Object.freeze(getUserId);
 var login;
 (function (login) {
-    const requestType = maileridType('LoginRequestBody');
-    const replyType = maileridType('LoginReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(mailerid_proto_1.mailerid.LoginRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(mailerid_proto_1.mailerid.LoginReplyBody);
     function wrapService(fn) {
         return bytes => {
             const { serviceUrl } = requestType.unpack(bytes);

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

@@ -1,8 +1,7 @@
 /// <reference types="node" />
 import { EnvelopeBody } from './connector';
-import { ProtoType } from '../lib-client/protobuf-loader';
+import { ProtoType } from '../lib-client/protobuf-type';
 declare type RuntimeException = web3n.RuntimeException;
-export declare function makeProtobufTypeFrom<T extends object>(protoFile: string, typeName: string): ProtoType<T>;
 export interface ObjectReference<T> {
     objType: T;
     path: string[];

package/build/ipc-via-protobuf/protobuf-msg.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
@@ -16,30 +16,15 @@
  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.makeProtobufTypeFrom = void 0;
+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 = void 0;
 const connector_1 = require("./connector");
 const error_1 = require("../lib-common/exceptions/error");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
-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);
-    }
-    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);
-    }
-}
-exports.makeProtobufTypeFrom = makeProtobufTypeFrom;
-function commonType(type) {
-    return makeProtobufTypeFrom('common.proto', `common.${type}`);
-}
-exports.objRefType = commonType('ObjectReference');
-exports.boolValType = commonType('BooleanValue');
-exports.strArrValType = commonType('StringArrayValue');
+const common_proto_1 = require("../protos/common.proto");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+exports.objRefType = protobuf_type_1.ProtoType.for(common_proto_1.common.ObjectReference);
+exports.boolValType = protobuf_type_1.ProtoType.for(common_proto_1.common.BooleanValue);
+exports.strArrValType = protobuf_type_1.ProtoType.for(common_proto_1.common.StringArrayValue);
 function fixArray(arr) {
     return (arr ? arr : []);
 }
@@ -80,7 +65,7 @@ function valOfOptInt(uint64) {
     return fixInt(valOf(uint64));
 }
 exports.valOfOptInt = valOfOptInt;
-const numValType = commonType('UInt64Value');
+const numValType = protobuf_type_1.ProtoType.for(common_proto_1.common.UInt64Value);
 function packInt(uint64) {
     return numValType.pack({ value: uint64 });
 }
@@ -89,7 +74,7 @@ function unpackInt(buf) {
     return fixInt(valOf(numValType.unpack(buf)));
 }
 exports.unpackInt = unpackInt;
-exports.errBodyType = commonType('ErrorValue');
+exports.errBodyType = protobuf_type_1.ProtoType.for(common_proto_1.common.ErrorValue);
 function errToMsg(err) {
     if (typeof err !== 'object') {
         return { err: JSON.stringify(err) };

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 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
@@ -21,6 +21,8 @@ const protobuf_msg_1 = require("./protobuf-msg");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const processes_1 = require("../lib-common/processes");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const startup_proto_1 = require("../protos/startup.proto");
 function wrapSignInCAP(cap) {
     return {
         completeLoginAndLocalSetup: completeLoginAndLocalSetup.wrapService(cap.completeLoginAndLocalSetup),
@@ -57,12 +59,9 @@ function makeSignUpCaller(caller, objPath) {
     };
 }
 exports.makeSignUpCaller = makeSignUpCaller;
-function startupType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('startup.proto', `startup.${type}`);
-}
 var getAvailableAddresses;
 (function (getAvailableAddresses) {
-    const requestType = startupType('GetAvailableAddressesRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.GetAvailableAddressesRequestBody);
     function wrapService(fn) {
         return buf => {
             const { name, token } = requestType.unpack(buf);
@@ -83,7 +82,7 @@ var getAvailableAddresses;
 Object.freeze(getAvailableAddresses);
 var addUser;
 (function (addUser) {
-    const requestType = startupType('AddUserRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.AddUserRequestBody);
     function wrapService(fn) {
         return buf => {
             const { userId, token } = requestType.unpack(buf);
@@ -104,7 +103,7 @@ var addUser;
 Object.freeze(addUser);
 var isActivated;
 (function (isActivated_1) {
-    const requestType = startupType('IsActivatedRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.IsActivatedRequestBody);
     function wrapService(fn) {
         return buf => {
             const { userId } = requestType.unpack(buf);
@@ -123,7 +122,7 @@ var isActivated;
     isActivated_1.makeCaller = makeCaller;
 })(isActivated || (isActivated = {}));
 Object.freeze(isActivated);
-const reqWithPassType = startupType('PassOnlyRequestBody');
+const reqWithPassType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.PassOnlyRequestBody);
 var createUserParams;
 (function (createUserParams) {
     function wrapService(fn) {
@@ -178,7 +177,7 @@ var getUsersOnDisk;
 Object.freeze(getUsersOnDisk);
 var startLoginToRemoteStorage;
 (function (startLoginToRemoteStorage) {
-    const requestType = startupType('StartLoginToRemoteStorageRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.StartLoginToRemoteStorageRequestBody);
     function wrapService(fn) {
         return buf => {
             const { address } = requestType.unpack(buf);
@@ -197,7 +196,7 @@ var startLoginToRemoteStorage;
     startLoginToRemoteStorage.makeCaller = makeCaller;
 })(startLoginToRemoteStorage || (startLoginToRemoteStorage = {}));
 Object.freeze(startLoginToRemoteStorage);
-const progressValueType = startupType('ProgressValue');
+const progressValueType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.ProgressValue);
 var completeLoginAndLocalSetup;
 (function (completeLoginAndLocalSetup) {
     function wrapService(fn) {
@@ -241,7 +240,7 @@ var completeLoginAndLocalSetup;
 Object.freeze(completeLoginAndLocalSetup);
 var useExistingStorage;
 (function (useExistingStorage) {
-    const requestType = startupType('UseExistingStorageRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(startup_proto_1.startup.UseExistingStorageRequestBody);
     function wrapService(fn) {
         return buf => {
             const { pass, address } = requestType.unpack(buf);

package/build/ipc-via-protobuf/storage-cap.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
@@ -19,6 +19,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeStorageCaller = exports.exposeStorageCAP = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
 const fs_1 = require("./fs");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const storage_proto_1 = require("../protos/storage.proto");
 function exposeStorageCAP(cap, expServices) {
     const wrap = {
         getAppLocalFS: getAppLocalFS.wrapService(cap.getAppLocalFS, expServices),
@@ -50,12 +52,9 @@ function makeStorageCaller(caller, objPath) {
     return storage;
 }
 exports.makeStorageCaller = makeStorageCaller;
-function storageType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('storage.proto', `storage.${type}`);
-}
 var getAppLocalFS;
 (function (getAppLocalFS) {
-    const requestType = storageType('GetAppLocalFSRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(storage_proto_1.storage.GetAppLocalFSRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { appName } = requestType.unpack(buf);
@@ -82,7 +81,7 @@ var getAppLocalFS;
 Object.freeze(getAppLocalFS);
 var getAppSyncedFS;
 (function (getAppSyncedFS) {
-    const requestType = storageType('GetAppSyncedFSRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(storage_proto_1.storage.GetAppSyncedFSRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { appName } = requestType.unpack(buf);
@@ -109,7 +108,7 @@ var getAppSyncedFS;
 Object.freeze(getAppSyncedFS);
 var getSysFS;
 (function (getSysFS) {
-    const requestType = storageType('GetSysFSRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(storage_proto_1.storage.GetSysFSRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { type, path } = requestType.unpack(buf);
@@ -138,7 +137,7 @@ var getSysFS;
 Object.freeze(getSysFS);
 var getUserFS;
 (function (getUserFS) {
-    const requestType = storageType('GetUserFSRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(storage_proto_1.storage.GetUserFSRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { type, path } = requestType.unpack(buf);

package/build/lib-client/cryptor/cryptor-in-worker.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
@@ -22,7 +22,8 @@ const os_1 = require("os");
 const processes_1 = require("../../lib-common/processes");
 const error_1 = require("../../lib-common/exceptions/error");
 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 assert_1 = require("../../lib-common/assert");
 const MAX_IDLE_MILLIS = 60 * 1000;
 const jsWorkerFName = 'worker-js.js';
@@ -264,8 +265,8 @@ exports.makeInWorkerCryptor = (logErr, logWarning, maxThreads) => {
 class WasmWorkers extends Workers {
     constructor(logErr, logWarning, maxThreads) {
         super(workerScriptFor('wasm'), logErr, logWarning, maxThreads);
-        this.reqType = makeProtobufType('Request');
-        this.replyType = makeProtobufType('Reply');
+        this.reqType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Request);
+        this.replyType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Reply);
     }
     call(req, interim) {
         const msg = this.reqType.pack(req);
@@ -296,27 +297,13 @@ function toLocalErr(replyErr) {
         return new Error(`WASM cryptor ${replyErr.condition}: ${replyErr.message}`);
     }
 }
-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);
-    }
-}
 exports.makeInWorkerWasmCryptor = (logErr, logWarning, maxThreads) => {
     assert_1.assert(typeof logErr === 'function');
     assert_1.assert(typeof logWarning === 'function');
     const workers = new WasmWorkers(logErr, logWarning, maxThreads);
     const close = workers.close.bind(workers);
-    const boolValType = makeProtobufType('BoolVal');
-    const kpairType = makeProtobufType('Keypair');
+    const boolValType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.BoolVal);
+    const kpairType = protobuf_type_1.ProtoType.for(cryptor_proto_1.cryptor.Keypair);
     const cryptor = {
         scrypt: (passwd, salt, logN, r, p, dkLen, progressCB) => workers.call({
             func: 1,