core-3nweb-client-lib 0.22.1 → 0.24.1

package/build/core/index.d.ts

@@ -2,7 +2,7 @@ import { FactoryOfFSs } from './storage';
 import { makeCryptor } from '../lib-client/cryptor/cryptor';
 import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
-declare type RequestedCAPs = web3n.caps.common.AppManifest['capsRequested'];
+declare type RequestedCAPs = web3n.caps.common.RequestedCAPs;
 declare type W3N = web3n.caps.common.W3N;
 export interface CoreConf {
     dataDir: string;

package/build/core/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2021 3NSoft Inc.
+ Copyright (C) 2015 - 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

package/build/ipc-via-protobuf/asmail-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
@@ -18,6 +18,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeASMailCaller = exports.exposeASMailCAP = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const asmail_proto_1 = require("../protos/asmail.proto");
 const connector_1 = require("./connector");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -68,9 +70,6 @@ function makeASMailCaller(caller, objPath) {
     };
 }
 exports.makeASMailCaller = makeASMailCaller;
-function asmailType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('asmail.proto', `asmail.${type}`);
-}
 var getUserId;
 (function (getUserId) {
     function wrapService(fn) {
@@ -96,8 +95,8 @@ var getUserId;
 Object.freeze(getUserId);
 var inboxListMsgs;
 (function (inboxListMsgs) {
-    const requestType = asmailType('ListMsgsRequestBody');
-    const replyType = asmailType('ListMsgsInboxReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.ListMsgsRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.ListMsgsInboxReplyBody);
     function unpackMsgInfos(buf) {
         const msgs = protobuf_msg_1.fixArray(replyType.unpack(buf).infos);
         for (const msg of msgs) {
@@ -128,7 +127,7 @@ var inboxListMsgs;
 Object.freeze(inboxListMsgs);
 var removeMsg;
 (function (removeMsg) {
-    const requestType = asmailType('RemoveMsgRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.RemoveMsgRequestBody);
     function wrapService(fn) {
         return (reqBody) => {
             const { msgId } = requestType.unpack(reqBody);
@@ -148,7 +147,7 @@ var removeMsg;
 Object.freeze(removeMsg);
 var getMsg;
 (function (getMsg) {
-    const requestType = asmailType('GetMsgRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.GetMsgRequestBody);
     function wrapService(fn, expServices) {
         return (reqBody) => {
             const { msgId } = requestType.unpack(reqBody);
@@ -167,7 +166,7 @@ var getMsg;
     getMsg.makeCaller = makeCaller;
 })(getMsg || (getMsg = {}));
 Object.freeze(getMsg);
-const incomingMessageType = asmailType('IncomingMessageMsg');
+const incomingMessageType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.IncomingMessageMsg);
 function packIncomingMessage(m, expServices) {
     const ipcMsg = {
         msgType: m.msgType,
@@ -207,7 +206,7 @@ function unpackIncomingMessage(buf, caller) {
 }
 var inboxSubscribe;
 (function (inboxSubscribe) {
-    const requestType = asmailType('SubscribeStartCallBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.SubscribeStartCallBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { event } = requestType.unpack(buf);
@@ -240,7 +239,7 @@ var inboxSubscribe;
 Object.freeze(inboxSubscribe);
 var preFlight;
 (function (preFlight) {
-    const requestType = asmailType('PreFlightRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.PreFlightRequestBody);
     function wrapService(fn) {
         return (reqBody) => {
             const { toAddress } = requestType.unpack(reqBody);
@@ -261,7 +260,7 @@ var preFlight;
 Object.freeze(preFlight);
 var addMsg;
 (function (addMsg) {
-    const requestType = asmailType('AddMsgRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.AddMsgRequestBody);
     function packMsg(m, caller) {
         const ipcMsg = {
             msgType: m.msgType,
@@ -361,7 +360,7 @@ var addMsg;
 Object.freeze(addMsg);
 var delivListMsgs;
 (function (delivListMsgs) {
-    const replyType = asmailType('ListMsgsDeliveryReplyBody');
+    const replyType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.ListMsgsDeliveryReplyBody);
     function wrapService(fn) {
         return () => {
             const promise = fn()
@@ -385,7 +384,7 @@ var delivListMsgs;
     delivListMsgs.makeCaller = makeCaller;
 })(delivListMsgs || (delivListMsgs = {}));
 Object.freeze(delivListMsgs);
-const deliveryProgressMsgType = asmailType('DeliveryProgressMsg');
+const deliveryProgressMsgType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.DeliveryProgressMsg);
 function packDeliveryProgress(p) {
     const m = {
         notConnected: protobuf_msg_1.toOptVal(p.notConnected),
@@ -427,7 +426,7 @@ function unpackDeliveryProgress(m) {
 }
 var currentState;
 (function (currentState) {
-    const requestType = asmailType('CurrentStateRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.CurrentStateRequestBody);
     function wrapService(fn) {
         return (reqBody) => {
             const { id } = requestType.unpack(reqBody);
@@ -458,7 +457,7 @@ var currentState;
 Object.freeze(currentState);
 var rmMsg;
 (function (rmMsg) {
-    const requestType = asmailType('RmMsgRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.RmMsgRequestBody);
     function wrapService(fn) {
         return (reqBody) => {
             const { id, cancelSending } = requestType.unpack(reqBody);
@@ -479,7 +478,7 @@ var rmMsg;
 Object.freeze(rmMsg);
 var observeAllDeliveries;
 (function (observeAllDeliveries) {
-    const notifType = asmailType('DeliveryNotificationWithId');
+    const notifType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.DeliveryNotificationWithId);
     function wrapService(fn) {
         return () => {
             const s = new rxjs_1.Subject();
@@ -518,7 +517,7 @@ var observeAllDeliveries;
 Object.freeze(observeAllDeliveries);
 var observeDelivery;
 (function (observeDelivery) {
-    const requestType = asmailType('ObserveDeliveryRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(asmail_proto_1.asmail.ObserveDeliveryRequestBody);
     function wrapService(fn) {
         return buf => {
             const { id } = requestType.unpack(buf);

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

@@ -2,8 +2,8 @@ import { ObjectReference } from './protobuf-msg';
 import { ExposedServices, Caller } from './connector';
 declare type FileByteSink = web3n.files.FileByteSink;
 declare type FileByteSource = web3n.files.FileByteSource;
-export declare function makeSinkCaller(caller: Caller, ref: ObjectReference): FileByteSink;
-export declare function exposeSinkService(sink: FileByteSink, expServices: ExposedServices): ObjectReference;
-export declare function makeSrcCaller(caller: Caller, ref: ObjectReference): FileByteSource;
-export declare function exposeSrcService(src: FileByteSource, expServices: ExposedServices): ObjectReference;
+export declare function makeSinkCaller(caller: Caller, ref: ObjectReference<'FileByteSink'>): FileByteSink;
+export declare function exposeSinkService(sink: FileByteSink, expServices: ExposedServices): ObjectReference<'FileByteSink'>;
+export declare function makeSrcCaller(caller: Caller, ref: ObjectReference<'FileByteSource'>): FileByteSource;
+export declare function exposeSrcService(src: FileByteSource, expServices: ExposedServices): ObjectReference<'FileByteSource'>;
 export {};

package/build/ipc-via-protobuf/bytes.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.exposeSrcService = exports.makeSrcCaller = exports.exposeSinkService = exports.makeSinkCaller = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const bytes_proto_1 = require("../protos/bytes.proto");
 const connector_1 = require("./connector");
 function makeSinkCaller(caller, ref) {
     connector_1.checkRefObjTypeIs('FileByteSink', ref);
@@ -69,9 +71,6 @@ function exposeSrcService(src, expServices) {
     return ref;
 }
 exports.exposeSrcService = exposeSrcService;
-function bytesType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('bytes.proto', `bytes.${type}`);
-}
 var sinkGetSize;
 (function (sinkGetSize) {
     function wrapService(fn) {
@@ -93,7 +92,7 @@ var sinkGetSize;
 Object.freeze(sinkGetSize);
 var sinkSplice;
 (function (sinkSplice) {
-    const requestType = bytesType('SpliceRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.SpliceRequestBody);
     function wrapService(fn) {
         return buf => {
             const { pos, del, bytes } = requestType.unpack(buf);
@@ -117,7 +116,7 @@ var sinkSplice;
 Object.freeze(sinkSplice);
 var sinkTruncate;
 (function (sinkTruncate) {
-    const requestType = bytesType('TruncateRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.TruncateRequestBody);
     function wrapService(fn) {
         return buf => {
             const { size } = requestType.unpack(buf);
@@ -138,7 +137,7 @@ var sinkTruncate;
 Object.freeze(sinkTruncate);
 var sinkShowLayout;
 (function (sinkShowLayout) {
-    const replyType = bytesType('FileLayoutMsg');
+    const replyType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.FileLayoutMsg);
     function packLayout(l) {
         return {
             base: protobuf_msg_1.toOptVal(l.base),
@@ -172,7 +171,7 @@ var sinkShowLayout;
 Object.freeze(sinkShowLayout);
 var sinkDone;
 (function (sinkDone) {
-    const requestType = bytesType('DoneRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.DoneRequestBody);
     function wrapService(fn) {
         return buf => {
             const { err } = requestType.unpack(buf);
@@ -232,8 +231,8 @@ var srcGetPosition;
 Object.freeze(srcGetPosition);
 var srcRead;
 (function (srcRead) {
-    const requestType = bytesType('ReadRequestBody');
-    const replyType = bytesType('ReadReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadReplyBody);
     function wrapService(fn) {
         return buf => {
             const { len } = requestType.unpack(buf);
@@ -254,7 +253,7 @@ var srcRead;
 Object.freeze(srcRead);
 var srcSeek;
 (function (srcSeek) {
-    const requestType = bytesType('SeekRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.SeekRequestBody);
     function wrapService(fn) {
         return buf => {
             const { offset } = requestType.unpack(buf);

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

@@ -20,9 +20,9 @@ export declare class ClientsSideImpl implements ClientsSide {
     private startCall;
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
-    registerClientDrop(o: any, srvRef: ObjectReference): void;
+    registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
     private makeClientDropCB;
     private sendObjDropMsg;
-    srvRefOf(clientObj: any): ObjectReference;
+    srvRefOf(clientObj: any): ObjectReference<any>;
     listObj(path: string[]): string[];
 }

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

@@ -1,4 +1,4 @@
-import { ObjectReference, ExposedObjType } from "./protobuf-msg";
+import { ObjectReference } from "./protobuf-msg";
 import { ServicesSide, Envelope, EnvelopeBody, ExposedFn, ExposedObj, ExposedServices } from "./connector";
 export declare class ServicesSideImpl implements ServicesSide {
     private readonly sendMsg;
@@ -16,8 +16,8 @@ export declare class ServicesSideImpl implements ServicesSide {
 }
 export declare class ExposedObjs {
     private readonly objs;
-    exposeDroppableService(objType: ExposedObjType, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference;
-    getOriginalObj<T>(ref: ObjectReference): T;
+    exposeDroppableService<T>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    getOriginalObj<T>(ref: ObjectReference<any>): T;
     exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
     drop(name: string): void;
     find(path: string[] | undefined): ExposedFn | ExposedObj<any> | undefined;

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

@@ -149,7 +149,6 @@ class ExposedObjs {
         this.objs = new Map();
     }
     exposeDroppableService(objType, exp, original) {
-        connector_1.ensureCorrectRefObjType(objType);
         let id;
         do {
             id = random_node_1.stringOfB64CharsSync(20);

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

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import { Observable, Observer, Subject } from "rxjs";
-import { ObjectReference, ExposedObjType, Value } from "./protobuf-msg";
+import { ObjectReference, Value } from "./protobuf-msg";
+import { ProtoType } from '../lib-client/protobuf-type';
 export interface ExposedServices {
-    exposeDroppableService(objType: ExposedObjType, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference;
-    getOriginalObj<T>(ref: ObjectReference): T;
+    exposeDroppableService<T>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    getOriginalObj<T>(ref: ObjectReference<any>): T;
     exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
     listObj(path: string[]): string[] | null;
 }
@@ -18,8 +19,8 @@ export interface ServicesSide {
 export interface Caller {
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
-    registerClientDrop(o: any, srvRef: ObjectReference): void;
-    srvRefOf(clientObj: any): ObjectReference;
+    registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
+    srvRefOf(clientObj: any): ObjectReference<any>;
     listObj(path: string[]): string[];
 }
 export interface ClientsSide {
@@ -43,7 +44,6 @@ export declare class ObjectsConnector {
     private sendCallError;
 }
 export declare const W3N_NAME = "w3n";
-export declare function ensureCorrectRefObjType(objType: ExposedObjType): void;
 /**
  * Envelope is a message form that is sent in IPC channel.
  */
@@ -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: import("../lib-client/protobuf-loader").ProtoType<Envelope>;
+export declare const msgProtoType: ProtoType<Envelope>;
 export declare type ExposedFn = (reqBody: EnvelopeBody) => ({
     promise?: Promise<EnvelopeBody>;
     obs?: Observable<EnvelopeBody>;
@@ -86,4 +86,4 @@ export interface IPCException extends web3n.RuntimeException {
     path?: string[];
 }
 export declare function makeIPCException(fields: Partial<IPCException>): IPCException;
-export declare function checkRefObjTypeIs(expected: ExposedObjType, ref: ObjectReference): void;
+export declare function checkRefObjTypeIs<T>(expected: T, ref: ObjectReference<T>): void;

package/build/ipc-via-protobuf/connector.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,8 +16,10 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkRefObjTypeIs = exports.makeIPCException = exports.msgProtoType = exports.ensureCorrectRefObjType = exports.W3N_NAME = exports.ObjectsConnector = void 0;
+exports.checkRefObjTypeIs = exports.makeIPCException = exports.msgProtoType = exports.W3N_NAME = exports.ObjectsConnector = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const ipc_proto_1 = require("../protos/ipc.proto");
 // 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.
@@ -156,22 +158,7 @@ exports.ObjectsConnector = ObjectsConnector;
 Object.freeze(ObjectsConnector.prototype);
 Object.freeze(ObjectsConnector);
 exports.W3N_NAME = 'w3n';
-function ensureCorrectRefObjType(objType) {
-    switch (objType) {
-        case 'FileByteSink':
-        case 'FileByteSource':
-        case 'FileImpl':
-        case 'FSImpl':
-        case 'SymLinkImpl':
-        case 'FSCollection':
-        case 'FSItemsIter':
-            return;
-        default:
-            throw new Error(`Object type ${objType} is not known`);
-    }
-}
-exports.ensureCorrectRefObjType = ensureCorrectRefObjType;
-exports.msgProtoType = protobuf_msg_1.makeProtobufTypeFrom('ipc.proto', 'ipc.Envelope');
+exports.msgProtoType = protobuf_type_1.ProtoType.for(ipc_proto_1.ipc.Envelope);
 function makeIPCException(fields) {
     const exc = {
         runtimeException: true,

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ObjectReference, Value } from "./protobuf-msg";
+import { ProtoType } from '../lib-client/protobuf-type';
 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;
@@ -20,7 +20,7 @@ export interface FileMsg {
     isVersioned: boolean;
     name: string;
     isNew: boolean;
-    impl: ObjectReference;
+    impl: ObjectReference<'FileImpl'>;
 }
 export declare function packXAttrValue(val: any): EnvelopeBody;
 export declare function unpackXAttrValue(buf: EnvelopeBody): any;
@@ -91,7 +91,7 @@ export declare namespace vReadJSON {
 export declare namespace vGetByteSource {
     interface Reply {
         version: number;
-        src: ObjectReference;
+        src: ObjectReference<'FileByteSource'>;
     }
     const replyType: ProtoType<Reply>;
     function wrapService(fn: ReadonlyFileVersionedAPI['getByteSource'], expServices: ExposedServices): ExposedFn;
@@ -120,7 +120,7 @@ export declare namespace updateXAttrs {
 export declare namespace vGetByteSink {
     interface Reply {
         version: number;
-        sink: ObjectReference;
+        sink: ObjectReference<'FileByteSink'>;
     }
     const replyType: ProtoType<Reply>;
     function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: ExposedServices): ExposedFn;

package/build/ipc-via-protobuf/file.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.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.unpackFileEvent = exports.packFileEvent = exports.unpackJSON = exports.packJSON = exports.readBytes = exports.unpackXAttrValue = exports.packXAttrValue = exports.unpackStats = exports.packStats = exports.fileMsgType = exports.exposeFileService = exports.makeFileCaller = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
+const protobuf_type_1 = require("../lib-client/protobuf-type");
+const file_proto_1 = require("../protos/file.proto");
 const connector_1 = require("./connector");
 const error_1 = require("../lib-common/exceptions/error");
 const bytes_1 = require("./bytes");
@@ -118,11 +120,8 @@ function exposeFileService(file, expServices) {
     return fileMsg;
 }
 exports.exposeFileService = exposeFileService;
-function makeFileType(type) {
-    return protobuf_msg_1.makeProtobufTypeFrom('file.proto', `file.${type}`);
-}
-exports.fileMsgType = makeFileType('File');
-const statsMsgType = makeFileType('StatsMsg');
+exports.fileMsgType = protobuf_type_1.ProtoType.for(file_proto_1.file.File);
+const statsMsgType = protobuf_type_1.ProtoType.for(file_proto_1.file.StatsMsg);
 function packStats(s) {
     const msg = {
         writable: s.writable,
@@ -151,7 +150,7 @@ function unpackStats(buf) {
     };
 }
 exports.unpackStats = unpackStats;
-const fileType = makeFileType('File');
+const fileType = protobuf_type_1.ProtoType.for(file_proto_1.file.File);
 var stat;
 (function (stat) {
     function wrapService(fn) {
@@ -171,7 +170,7 @@ var stat;
     stat.makeCaller = makeCaller;
 })(stat || (stat = {}));
 Object.freeze(stat);
-const xattrValueType = makeFileType('XAttrValue');
+const xattrValueType = protobuf_type_1.ProtoType.for(file_proto_1.file.XAttrValue);
 function packXAttrValue(val) {
     if (Buffer.isBuffer(val)) {
         return xattrValueType.pack({ bytes: protobuf_msg_1.toVal(val) });
@@ -202,7 +201,7 @@ function unpackXAttrValue(buf) {
 exports.unpackXAttrValue = unpackXAttrValue;
 var getXAttr;
 (function (getXAttr) {
-    const requestType = makeFileType('GetXAttrRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.GetXAttrRequestBody);
     function wrapService(fn) {
         return buf => {
             const { xaName } = requestType.unpack(buf);
@@ -242,8 +241,8 @@ var listXAttrs;
 Object.freeze(listXAttrs);
 var readBytes;
 (function (readBytes) {
-    const requestType = makeFileType('ReadBytesRequestBody');
-    const replyType = makeFileType('ReadBytesReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.ReadBytesRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.ReadBytesReplyBody);
     function packReply(bytes) {
         return replyType.pack({ bytes: protobuf_msg_1.toOptVal(bytes) });
     }
@@ -351,7 +350,7 @@ var getByteSource;
     getByteSource.makeCaller = makeCaller;
 })(getByteSource || (getByteSource = {}));
 Object.freeze(getByteSource);
-const fileEventType = makeFileType('FileEventMsg');
+const fileEventType = protobuf_type_1.ProtoType.for(file_proto_1.file.FileEventMsg);
 function packFileEvent(e) {
     const msg = {
         type: e.type,
@@ -411,8 +410,8 @@ var watch;
 Object.freeze(watch);
 var vGetXAttr;
 (function (vGetXAttr) {
-    const requestType = makeFileType('GetXAttrRequestBody');
-    vGetXAttr.replyType = makeFileType('VersionedGetXAttrReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.GetXAttrRequestBody);
+    vGetXAttr.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedGetXAttrReplyBody);
     function unpackReply(buf) {
         const { json, str, bytes, version: v } = vGetXAttr.replyType.unpack(buf);
         const version = protobuf_msg_1.fixInt(v);
@@ -457,7 +456,7 @@ var vGetXAttr;
 Object.freeze(vGetXAttr);
 var vListXAttrs;
 (function (vListXAttrs) {
-    vListXAttrs.replyType = makeFileType('VersionedListXAttrsReplyBody');
+    vListXAttrs.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedListXAttrsReplyBody);
     function wrapService(fn) {
         return () => {
             const promise = fn()
@@ -480,8 +479,8 @@ var vListXAttrs;
 Object.freeze(vListXAttrs);
 var vReadBytes;
 (function (vReadBytes) {
-    const requestType = makeFileType('ReadBytesRequestBody');
-    const replyType = makeFileType('VersionedReadBytesReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.ReadBytesRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadBytesReplyBody);
     function packReply(r) {
         return replyType.pack({
             version: r.version, bytes: protobuf_msg_1.toOptVal(r.bytes)
@@ -515,7 +514,7 @@ var vReadBytes;
 Object.freeze(vReadBytes);
 var vReadTxt;
 (function (vReadTxt) {
-    vReadTxt.replyType = makeFileType('VersionedReadTxtReplyBody');
+    vReadTxt.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadTxtReplyBody);
     function wrapService(fn) {
         return () => {
             const promise = fn()
@@ -538,7 +537,7 @@ var vReadTxt;
 Object.freeze(vReadTxt);
 var vReadJSON;
 (function (vReadJSON) {
-    vReadJSON.replyType = makeFileType('VersionedReadJsonReplyBody');
+    vReadJSON.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadJsonReplyBody);
     function wrapService(fn) {
         return () => {
             const promise = fn()
@@ -568,7 +567,7 @@ var vReadJSON;
 Object.freeze(vReadJSON);
 var vGetByteSource;
 (function (vGetByteSource) {
-    vGetByteSource.replyType = makeFileType('VersionedGetByteSourceReplyBody');
+    vGetByteSource.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedGetByteSourceReplyBody);
     function wrapService(fn, expServices) {
         return () => {
             const promise = fn()
@@ -594,7 +593,7 @@ var vGetByteSource;
 Object.freeze(vGetByteSource);
 var updateXAttrs;
 (function (updateXAttrs) {
-    const requestType = makeFileType('UpdateXAttrsRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.UpdateXAttrsRequestBody);
     function fromReqChanges(r) {
         const attrs = {};
         if (r.set) {
@@ -668,7 +667,7 @@ var updateXAttrs;
 Object.freeze(updateXAttrs);
 var writeBytes;
 (function (writeBytes) {
-    const requestType = makeFileType('WriteBytesRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.WriteBytesRequestBody);
     function wrapService(fn) {
         return buf => {
             const { bytes } = requestType.unpack(buf);
@@ -689,7 +688,7 @@ var writeBytes;
 Object.freeze(writeBytes);
 var writeTxt;
 (function (writeTxt) {
-    const requestType = makeFileType('WriteTxtRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.WriteTxtRequestBody);
     function wrapService(fn) {
         return buf => {
             const { txt } = requestType.unpack(buf);
@@ -708,7 +707,7 @@ var writeTxt;
 Object.freeze(writeTxt);
 var writeJSON;
 (function (writeJSON) {
-    const requestType = makeFileType('WriteJsonRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.WriteJsonRequestBody);
     function wrapService(fn) {
         return buf => {
             const { json } = requestType.unpack(buf);
@@ -729,7 +728,7 @@ var writeJSON;
 Object.freeze(writeJSON);
 var getByteSink;
 (function (getByteSink) {
-    const requestType = makeFileType('GetByteSinkRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.GetByteSinkRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { truncateFile } = requestType.unpack(buf);
@@ -758,7 +757,7 @@ var getByteSink;
 Object.freeze(getByteSink);
 var copy;
 (function (copy) {
-    copy.requestType = makeFileType('CopyRequestBody');
+    copy.requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.CopyRequestBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { file: fRef } = copy.requestType.unpack(buf);
@@ -827,7 +826,7 @@ var vUpdateXAttrs;
 Object.freeze(vUpdateXAttrs);
 var vWriteBytes;
 (function (vWriteBytes) {
-    const requestType = makeFileType('WriteBytesRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.WriteBytesRequestBody);
     function wrapService(fn) {
         return buf => {
             const { bytes } = requestType.unpack(buf);
@@ -848,7 +847,7 @@ var vWriteBytes;
 Object.freeze(vWriteBytes);
 var vWriteTxt;
 (function (vWriteTxt) {
-    const requestType = makeFileType('WriteTxtRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.WriteTxtRequestBody);
     function wrapService(fn) {
         return buf => {
             const { txt } = requestType.unpack(buf);
@@ -869,7 +868,7 @@ var vWriteTxt;
 Object.freeze(vWriteTxt);
 var vWriteJSON;
 (function (vWriteJSON) {
-    const requestType = makeFileType('WriteJsonRequestBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.WriteJsonRequestBody);
     function wrapService(fn) {
         return buf => {
             const { json } = requestType.unpack(buf);
@@ -890,8 +889,8 @@ var vWriteJSON;
 Object.freeze(vWriteJSON);
 var vGetByteSink;
 (function (vGetByteSink) {
-    const requestType = makeFileType('VersionedGetByteSinkRequestBody');
-    vGetByteSink.replyType = makeFileType('VersionedGetByteSinkReplyBody');
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedGetByteSinkRequestBody);
+    vGetByteSink.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedGetByteSinkReplyBody);
     function wrapService(fn, expServices) {
         return buf => {
             const { truncateFile, currentVersion } = requestType.unpack(buf);