core-3nweb-client-lib 0.27.3 → 0.27.4

package/build/core/asmail/keyring/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 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,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyRing = exports.KEY_USE = void 0;
+exports.makeAndKeyRing = exports.KEY_USE = void 0;
 const correspondent_keys_1 = require("./correspondent-keys");
 const id_to_email_map_1 = require("./id-to-email-map");
 const common_1 = require("./common");
@@ -27,9 +27,14 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../../lib-common/canonical-address");
 const common_2 = require("../delivery/common");
 const keyring_storage_1 = require("./keyring-storage");
+const assert_1 = require("../../../lib-common/assert");
 var common_3 = require("./common");
 Object.defineProperty(exports, "KEY_USE", { enumerable: true, get: function () { return common_3.KEY_USE; } });
-class KeyRing {
+function makeAndKeyRing(cryptor, fs, publishedKeys) {
+    return KRing.makeAndStart(cryptor, fs, publishedKeys);
+}
+exports.makeAndKeyRing = makeAndKeyRing;
+class KRing {
     constructor(cryptor, publishedKeys) {
         this.cryptor = cryptor;
         this.publishedKeys = publishedKeys;
@@ -39,7 +44,11 @@ class KeyRing {
         this.corrKeys = new Map();
         this.pairIdToEmailMap = new id_to_email_map_1.IdToEmailMap();
         this.storage = undefined;
-        this.needIntroKeyFor = (address) => {
+        this.asKeyPairsStorage = {
+            pairIdToEmailMap: this.pairIdToEmailMap,
+            saveChanges: this.saveChanges.bind(this)
+        };
+        this.needIntroKeyFor = address => {
             address = (0, canonical_address_1.toCanonicalAddress)(address);
             return !this.corrKeys.has(address);
         };
@@ -68,65 +77,14 @@ class KeyRing {
             const suggestPair = await ck.suggestPair();
             return suggestPair;
         };
-        this.decrypt = async (msgMeta, getMainObjHeader, getOpenedMsg, checkMidKeyCerts) => {
-            let decrInfo;
-            let incrMsgCount;
-            let openedMsg;
-            if (msgMeta.pid) {
-                const r = await this.decryptMsgKeyWithEstablishedPair(msgMeta.pid, getMainObjHeader);
-                if (!r) {
-                    return;
-                }
-                decrInfo = r.keyInfo;
-                incrMsgCount = r.incrMsgCount;
-                openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
-            }
-            else {
-                decrInfo = await this.decryptMsgKeyWithIntroPair(msgMeta.recipientKid, msgMeta.senderPKey, getMainObjHeader);
-                if (!decrInfo) {
-                    return;
-                }
-                openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
-                const certs = openedMsg.introCryptoCerts;
-                const { address, pkey } = await checkMidKeyCerts(certs);
-                if (pkey.k !== msgMeta.senderPKey) {
-                    throw new Error(`Key certificates in the message are not for a key that encrypted this message.`);
-                }
-                decrInfo.correspondent = (0, canonical_address_1.toCanonicalAddress)(address);
-            }
-            // check that sender is the same as the trusted correspondent
-            const sender = openedMsg.sender;
-            if (!sender || !(0, canonical_address_1.areAddressesEqual)(sender, decrInfo.correspondent)) {
-                throw new Error(`Mismatch between message sender field '${sender}', and address '${decrInfo.correspondent}', associated with decrypting key.`);
-            }
-            // update received msg counts and a time stamp
-            if (incrMsgCount) {
-                incrMsgCount(openedMsg.msgCount);
-            }
-            // absorb next crypto
-            const pair = openedMsg.nextCrypto;
-            if (pair) {
-                if (msgMeta.recipientKid) {
-                    if (!pair.isSenderIntroKey) {
-                        throw new Error(`Introductory message is not referencing used intro key in the next crypto`);
-                    }
-                    if (msgMeta.recipientKid !== pair.senderKid) {
-                        throw new Error(`Introductory message is referencing wrong key in the next crypto`);
-                    }
-                }
-                this.absorbSuggestedNextKeyPair(decrInfo.correspondent, pair);
-            }
-            return { decrInfo, openedMsg };
-        };
         Object.seal(this);
     }
     addCorrespondent(address, serialForm) {
         const ck = (serialForm ?
-            new correspondent_keys_1.CorrespondentKeys(this, undefined, serialForm) :
-            new correspondent_keys_1.CorrespondentKeys(this, address));
+            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, undefined, serialForm) :
+            new correspondent_keys_1.CorrespondentKeys(this.asKeyPairsStorage, address));
         if (this.corrKeys.has(ck.correspondent)) {
-            throw new Error("Correspondent with address " + ck.correspondent +
-                " is already present.");
+            throw new Error(`Correspondent with address ${ck.correspondent} is already present.`);
         }
         this.corrKeys.set(ck.correspondent, ck);
         if (serialForm) {
@@ -135,9 +93,7 @@ class KeyRing {
         return ck;
     }
     async init(fs) {
-        if (this.storage) {
-            throw new Error("Keyring has already been initialized.");
-        }
+        (0, assert_1.assert)(!this.storage);
         this.storage = (0, keyring_storage_1.makeKeyringStorage)(fs);
         await this.storage.start();
         const serialForm = await this.storage.load();
@@ -155,9 +111,15 @@ class KeyRing {
         }
     }
     static async makeAndStart(cryptor, fs, publishedKeys) {
-        const kr = new KeyRing(cryptor, publishedKeys);
+        const kr = new KRing(cryptor, publishedKeys);
         await kr.init(fs);
-        return kr;
+        return {
+            close: kr.close.bind(kr),
+            decrypt: kr.decrypt.bind(kr),
+            generateKeysToSend: kr.generateKeysToSend.bind(kr),
+            needIntroKeyFor: kr.needIntroKeyFor.bind(kr),
+            nextCrypto: kr.nextCrypto.bind(kr)
+        };
     }
     saveChanges() {
         // pack bytes that need to be encrypted and saved
@@ -253,9 +215,10 @@ class KeyRing {
                     const corrKeys = this.corrKeys.get(keyInfo.correspondent);
                     corrKeys.markPairAsInUse(pair);
                 }
-                // prepare msg count incrementor that will be "called back"
-                const incrMsgCount = (msgCount) => this.updateReceivedMsgCountIn(pair, msgCount);
-                return { keyInfo, incrMsgCount };
+                return {
+                    keyInfo,
+                    incrMsgCount: msgCount => this.updateReceivedMsgCountIn(pair, msgCount)
+                };
             }
             catch (err) {
                 if (!err.failedCipherVerification) {
@@ -301,13 +264,63 @@ class KeyRing {
         }
         this.saveChanges();
     }
+    async decrypt(msgMeta, getMainObjHeader, getOpenedMsg, checkMidKeyCerts) {
+        let decrInfo;
+        let incrMsgCount;
+        let openedMsg;
+        if (msgMeta.pid) {
+            const r = await this.decryptMsgKeyWithEstablishedPair(msgMeta.pid, getMainObjHeader);
+            if (!r) {
+                return;
+            }
+            decrInfo = r.keyInfo;
+            incrMsgCount = r.incrMsgCount;
+            openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
+        }
+        else {
+            decrInfo = await this.decryptMsgKeyWithIntroPair(msgMeta.recipientKid, msgMeta.senderPKey, getMainObjHeader);
+            if (!decrInfo) {
+                return;
+            }
+            openedMsg = await getOpenedMsg(decrInfo.key, decrInfo.msgKeyPackLen);
+            const certs = openedMsg.introCryptoCerts;
+            const { address, pkey } = await checkMidKeyCerts(certs);
+            if (pkey.k !== msgMeta.senderPKey) {
+                throw new Error(`Key certificates in the message are not for a key that encrypted this message.`);
+            }
+            decrInfo.correspondent = (0, canonical_address_1.toCanonicalAddress)(address);
+        }
+        // check that sender is the same as the trusted correspondent
+        const sender = openedMsg.sender;
+        if (!sender || !(0, canonical_address_1.areAddressesEqual)(sender, decrInfo.correspondent)) {
+            throw new Error(`Mismatch between message sender field '${sender}', and address '${decrInfo.correspondent}', associated with decrypting key.`);
+        }
+        // update received msg counts and a time stamp
+        if (incrMsgCount) {
+            incrMsgCount(openedMsg.msgCount);
+        }
+        // absorb next crypto
+        const pair = openedMsg.nextCrypto;
+        if (pair) {
+            if (msgMeta.recipientKid) {
+                if (!pair.isSenderIntroKey) {
+                    throw new Error(`Introductory message is not referencing used intro key in the next crypto`);
+                }
+                if (msgMeta.recipientKid !== pair.senderKid) {
+                    throw new Error(`Introductory message is referencing wrong key in the next crypto`);
+                }
+            }
+            this.absorbSuggestedNextKeyPair(decrInfo.correspondent, pair);
+        }
+        return { decrInfo, openedMsg };
+    }
+    ;
     close() {
         return this.storage.close();
     }
 }
-exports.KeyRing = KeyRing;
-Object.freeze(KeyRing.prototype);
-Object.freeze(KeyRing);
+Object.freeze(KRing.prototype);
+Object.freeze(KRing);
 function msgKeyPackLenForPair(p) {
     return (0, common_1.msgKeyPackSizeFor)(p.recipientKey.skey.alg);
 }

package/build/core/index.js

@@ -225,8 +225,7 @@ function makeStoragePolicy(appDomain, requestedCAPs) {
     }
     else if (Array.isArray(capReq.appFS)) {
         const okDomains = capReq.appFS
-            .filter(fsInfo => (fsInfo.domain === appDomain) ||
-            fsInfo.domain.endsWith('.' + appDomain))
+            .filter(fsInfo => (fsInfo.domain === appDomain) || fsInfo.domain.endsWith('.' + appDomain))
             .map(fsInfo => (0, json_utils_1.copy)(fsInfo));
         policy = {
             canOpenAppFS: severalDomainsAppFSChecker(okDomains)

package/build/core/sign-in.js

@@ -45,7 +45,7 @@ class SignIn {
                 const midKeyProgressCB = makeKeyGenProgressCB(0, 50, progressCB);
                 const midKeyGen = async (params) => (await (0, key_derivation_1.deriveMidKeyPair)(this.cryptor, pass, params, midKeyProgressCB)).skey;
                 const storeKeyProgressCB = makeKeyGenProgressCB(51, 100, progressCB);
-                const storeKeyGen = (params) => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
+                const storeKeyGen = params => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
                 const idManager = await this.completeInitWithoutCache(midKeyGen, storeKeyGen);
                 if (!idManager) {
                     return false;

package/build/core/storage/synced/obj-files.d.ts

@@ -89,4 +89,6 @@ export declare class SyncedObj {
     syncStatus(): SyncedObjStatus;
     statusObj(): ObjStatus;
     recordRemovalUploadAndGC(): Promise<void>;
+    isRemoteVersionOnDisk(version: number): Promise<'complete' | 'partial' | 'none'>;
+    downloadRemoteVersion(version: number): Promise<void>;
 }

package/build/core/storage/synced/obj-files.js

@@ -32,6 +32,7 @@ const obj_status_1 = require("./obj-status");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 const upload_header_file_1 = require("./upload-header-file");
 const utils_1 = require("../common/utils");
+const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
 exports.UNSYNCED_FILE_NAME_EXT = 'unsynced';
 exports.REMOTE_FILE_NAME_EXT = 'v';
 /**
@@ -338,7 +339,8 @@ class SyncedObj {
             this.remoteVers.set(uploadVersion, syncedVerObj);
         }
         else {
-            await fs.rename(this.localVerPath(localVersion), remotePath);
+            const localPath = this.localVerPath(localVersion);
+            await fs.rename(localPath, remotePath);
         }
         await this.status.recordUploadCompletion(localVersion, uploadVersion);
         this.scheduleSelfGC();
@@ -395,6 +397,21 @@ class SyncedObj {
         await this.status.recordRemoteRemovalCompletion();
         this.scheduleSelfGC();
     }
+    async isRemoteVersionOnDisk(version) {
+        if (!this.status.isAmongRemote(version)) {
+            throw (0, exceptions_1.makeObjVersionNotFoundExc)(this.objId, version);
+        }
+        const verPath = this.remoteVerPath(version);
+        if (!(await isOnDisk(verPath))) {
+            return 'none';
+        }
+        const objVer = await this.instanceOfRemoteObjVer(version);
+        return (objVer.doesFileNeedDownload() ? 'complete' : 'partial');
+    }
+    async downloadRemoteVersion(version) {
+        const objVer = await this.instanceOfRemoteObjVer(version);
+        await objVer.downloadMissingSections();
+    }
 }
 exports.SyncedObj = SyncedObj;
 Object.freeze(SyncedObj.prototype);

package/build/core/storage/synced/obj-status.d.ts

@@ -125,6 +125,7 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     neverUploaded(): boolean;
     versionBeforeUnsyncedRemoval(): number | undefined;
     adoptRemoteVersion(version?: number, dropLocalVer?: boolean): Promise<void>;
+    isAmongRemote(version: number): boolean;
 }
 export declare function readAndCheckStatus(objFolder: string, objId: ObjId): Promise<ObjStatusInfo>;
 export {};

package/build/core/storage/synced/obj-status.js

@@ -551,6 +551,16 @@ class ObjStatus {
         this.updateStateIndicator();
         await this.triggerSaveProc();
     }
+    isAmongRemote(version) {
+        var _a;
+        if (this.status.remote.current === version) {
+            return true;
+        }
+        if ((_a = this.status.remote.archived) === null || _a === void 0 ? void 0 : _a.includes(version)) {
+            return true;
+        }
+        return false;
+    }
 }
 exports.ObjStatus = ObjStatus;
 Object.freeze(ObjStatus.prototype);

package/build/core/storage/synced/storage.js

@@ -47,8 +47,6 @@ class SyncedStore {
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
         s.uploader.start();
-        // XXX ??
-        // s.remoteEvents.startAbsorbingRemoteEvents();
         return {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
             startObjProcs: () => {
@@ -60,8 +58,6 @@ class SyncedStore {
         const { remote, setMid } = service_1.StorageOwner.makeBeforeMidSetup(user, remoteServiceUrl, net);
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
-        // XXX ??
-        // s.remoteEvents.startAbsorbingRemoteEvents();
         return {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
             setupRemoteAndStartObjProcs: getSigner => {
@@ -126,25 +122,12 @@ class SyncedStore {
         return !!obj;
     }
     async isRemoteVersionOnDisk(objId, version) {
-        var _a;
         const obj = await this.getObjOrThrow(objId, true);
-        const status = obj.statusObj();
-        const { remote } = status.syncStatus();
-        if (((remote === null || remote === void 0 ? void 0 : remote.latest) !== version)
-            || !((_a = remote.archived) === null || _a === void 0 ? void 0 : _a.includes(version))) {
-            throw (0, exceptions_1.makeObjVersionNotFoundExc)(objId, version);
-        }
-        // XXX
-        //  - get state of file
-        throw new Error('SyncedStore.isRemoteVersionOnDisk() not implemented.');
+        return obj.isRemoteVersionOnDisk(version);
     }
-    download(objId, version) {
-        // XXX
-        //  - check if on disk
-        //  - download header
-        //  - want result of DC-296, calculation of diff to download, relative to
-        //    latest version on the disk, using headers of both versions.
-        throw new Error('SyncedStore.download() not implemented.');
+    async download(objId, version) {
+        const obj = await this.getObjOrThrow(objId, true);
+        return obj.downloadRemoteVersion(version);
     }
     async upload(objId, localVersion, uploadVersion, uploadHeader, createOnRemote) {
         const obj = await this.getObjOrThrow(objId, true);

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

@@ -14,6 +14,7 @@ declare type FileEvent = web3n.files.FileEvent;
 declare type RemoteEvent = web3n.files.RemoteEvent;
 declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 declare type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 export declare function makeFileCaller(caller: Caller, fileMsg: FileMsg): File;
 export declare function exposeFileService(file: File, expServices: ExposedServices): FileMsg;
 export interface FileMsg {
@@ -41,6 +42,12 @@ export declare function packJSON(json: any): EnvelopeBody;
 export declare function unpackJSON(buf: EnvelopeBody): any;
 export declare function packFileEvent(e: FileEvent | RemoteEvent): Buffer;
 export declare function unpackFileEvent(buf: EnvelopeBody): FileEvent | RemoteEvent;
+export interface VersionedReadFlagsMsg {
+    archivedVersion?: Value<number>;
+    remoteVersion?: Value<number>;
+}
+export declare function versionedReadFlagsFromMsg(msg: VersionedReadFlagsMsg | undefined): VersionedReadFlags | undefined;
+export declare function versionedReadFlagsToMsg(flags: VersionedReadFlags | undefined): VersionedReadFlagsMsg | undefined;
 export declare namespace vGetXAttr {
     interface Reply {
         version: number;

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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vListVersions = exports.remoteAdoptionOptsFromMsg = exports.remoteAdoptionOptsToMsg = exports.optionsToUploadLocalFromMsg = exports.optionsToUploadLocalToMsg = exports.vGetByteSink = exports.updateXAttrs = exports.xattrFromMsg = exports.xattrToMsg = 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.unpackSyncStatus = exports.packSyncStatus = exports.unpackStats = exports.packStats = exports.fileMsgType = exports.exposeFileService = exports.makeFileCaller = void 0;
+exports.vListVersions = exports.remoteAdoptionOptsFromMsg = exports.remoteAdoptionOptsToMsg = exports.optionsToUploadLocalFromMsg = exports.optionsToUploadLocalToMsg = exports.vGetByteSink = exports.updateXAttrs = exports.xattrFromMsg = exports.xattrToMsg = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.versionedReadFlagsToMsg = exports.versionedReadFlagsFromMsg = exports.unpackFileEvent = exports.packFileEvent = exports.unpackJSON = exports.packJSON = exports.readBytes = exports.unpackXAttrValue = exports.packXAttrValue = exports.unpackSyncStatus = exports.packSyncStatus = 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");
@@ -533,9 +533,29 @@ var watch;
     watch.makeCaller = makeCaller;
 })(watch || (watch = {}));
 Object.freeze(watch);
+function versionedReadFlagsFromMsg(msg) {
+    if (!msg) {
+        return;
+    }
+    return {
+        archivedVersion: (0, protobuf_msg_1.valOfOptInt)(msg.archivedVersion),
+        remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion)
+    };
+}
+exports.versionedReadFlagsFromMsg = versionedReadFlagsFromMsg;
+function versionedReadFlagsToMsg(flags) {
+    if (!flags) {
+        return;
+    }
+    return {
+        archivedVersion: (0, protobuf_msg_1.toOptVal)(flags.archivedVersion),
+        remoteVersion: (0, protobuf_msg_1.toOptVal)(flags.remoteVersion)
+    };
+}
+exports.versionedReadFlagsToMsg = versionedReadFlagsToMsg;
 var vGetXAttr;
 (function (vGetXAttr) {
-    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.GetXAttrRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedGetXAttrRequestBody);
     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);
@@ -553,8 +573,8 @@ var vGetXAttr;
     vGetXAttr.unpackReply = unpackReply;
     function wrapService(fn) {
         return buf => {
-            const { xaName } = requestType.unpack(buf);
-            const promise = fn(xaName)
+            const { xaName, flags } = requestType.unpack(buf);
+            const promise = fn(xaName, versionedReadFlagsFromMsg(flags))
                 .then(({ attr, version }) => {
                 if (Buffer.isBuffer(attr)) {
                     return vGetXAttr.replyType.pack({ version, bytes: (0, protobuf_msg_1.toVal)(attr) });
@@ -572,19 +592,31 @@ var vGetXAttr;
     vGetXAttr.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('getXAttr');
-        return () => caller
-            .startPromiseCall(path, undefined)
+        return (xaName, flags) => caller
+            .startPromiseCall(path, requestType.pack({
+            xaName, flags: versionedReadFlagsToMsg(flags)
+        }))
             .then(unpackReply);
     }
     vGetXAttr.makeCaller = makeCaller;
 })(vGetXAttr = exports.vGetXAttr || (exports.vGetXAttr = {}));
 Object.freeze(vGetXAttr);
+const requestWithReadFlags = protobuf_type_1.ProtoType.for(file_proto_1.file.RequestWithVersionedReadFlags);
+function packVersionedReadFlagsRequest(flags) {
+    return requestWithReadFlags.pack({
+        flags: versionedReadFlagsToMsg(flags)
+    });
+}
+function unpackVersionedReadFlagsRequest(buf) {
+    const { flags } = requestWithReadFlags.unpack(buf);
+    return versionedReadFlagsFromMsg(flags);
+}
 var vListXAttrs;
 (function (vListXAttrs) {
     vListXAttrs.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedListXAttrsReplyBody);
     function wrapService(fn) {
-        return () => {
-            const promise = fn()
+        return buf => {
+            const promise = fn(unpackVersionedReadFlagsRequest(buf))
                 .then(({ version, lst }) => vListXAttrs.replyType.pack({ version, xaNames: lst }));
             return { promise };
         };
@@ -592,8 +624,8 @@ var vListXAttrs;
     vListXAttrs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('listXAttrs');
-        return () => caller
-            .startPromiseCall(path, undefined)
+        return flags => caller
+            .startPromiseCall(path, packVersionedReadFlagsRequest(flags))
             .then(buf => {
             const { xaNames, version: v } = vListXAttrs.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), lst: (xaNames ? xaNames : []) };
@@ -604,7 +636,7 @@ var vListXAttrs;
 Object.freeze(vListXAttrs);
 var vReadBytes;
 (function (vReadBytes) {
-    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.ReadBytesRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadBytesRequestBody);
     const replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadBytesReplyBody);
     function packReply(r) {
         return replyType.pack({
@@ -619,8 +651,8 @@ var vReadBytes;
     vReadBytes.unpackReply = unpackReply;
     function wrapService(fn) {
         return buf => {
-            const { start, end } = requestType.unpack(buf);
-            const promise = fn((0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
+            const { start, end, flags } = requestType.unpack(buf);
+            const promise = fn((0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end), versionedReadFlagsFromMsg(flags))
                 .then(packReply);
             return { promise };
         };
@@ -628,9 +660,10 @@ var vReadBytes;
     vReadBytes.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('readBytes');
-        return (start, end) => caller
+        return (start, end, flags) => caller
             .startPromiseCall(path, requestType.pack({
-            start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
+            start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end),
+            flags: versionedReadFlagsToMsg(flags)
         }))
             .then(unpackReply);
     }
@@ -641,8 +674,8 @@ var vReadTxt;
 (function (vReadTxt) {
     vReadTxt.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadTxtReplyBody);
     function wrapService(fn) {
-        return () => {
-            const promise = fn()
+        return buf => {
+            const promise = fn(unpackVersionedReadFlagsRequest(buf))
                 .then(verAndTxt => vReadTxt.replyType.pack(verAndTxt));
             return { promise };
         };
@@ -650,8 +683,8 @@ var vReadTxt;
     vReadTxt.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('readTxt');
-        return () => caller
-            .startPromiseCall(path, undefined)
+        return flags => caller
+            .startPromiseCall(path, packVersionedReadFlagsRequest(flags))
             .then(buf => {
             const { version: v, txt } = vReadTxt.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), txt };
@@ -664,8 +697,8 @@ var vReadJSON;
 (function (vReadJSON) {
     vReadJSON.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedReadJsonReplyBody);
     function wrapService(fn) {
-        return () => {
-            const promise = fn()
+        return buf => {
+            const promise = fn(unpackVersionedReadFlagsRequest(buf))
                 .then(({ version, json }) => {
                 return vReadJSON.replyType.pack({ version, json: JSON.stringify(json) });
             });
@@ -675,8 +708,8 @@ var vReadJSON;
     vReadJSON.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('readJSON');
-        return () => caller
-            .startPromiseCall(path, undefined)
+        return flags => caller
+            .startPromiseCall(path, packVersionedReadFlagsRequest(flags))
             .then(buf => {
             const { version: v, json } = vReadJSON.replyType.unpack(buf);
             try {
@@ -694,8 +727,8 @@ var vGetByteSource;
 (function (vGetByteSource) {
     vGetByteSource.replyType = protobuf_type_1.ProtoType.for(file_proto_1.file.VersionedGetByteSourceReplyBody);
     function wrapService(fn, expServices) {
-        return () => {
-            const promise = fn()
+        return buf => {
+            const promise = fn(unpackVersionedReadFlagsRequest(buf))
                 .then(({ version, src }) => {
                 const ref = (0, bytes_1.exposeSrcService)(src, expServices);
                 return vGetByteSource.replyType.pack({ version, src: ref });
@@ -706,8 +739,8 @@ var vGetByteSource;
     vGetByteSource.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const path = objPath.concat('getByteSource');
-        return () => caller
-            .startPromiseCall(path, undefined)
+        return flags => caller
+            .startPromiseCall(path, packVersionedReadFlagsRequest(flags))
             .then(buf => {
             const { version: v, src: ref } = vGetByteSource.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), src: (0, bytes_1.makeSrcCaller)(caller, ref) };