core-3nweb-client-lib 0.27.4 → 0.27.5

package/build/core/asmail/inbox/msg-on-disk.js

@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgOnDisk = void 0;
 const fs = require("../../../lib-common/async-fs-node");

package/build/core/asmail/index.js

@@ -99,8 +99,8 @@ class ASMail {
     }
     async setupInbox(syncedFS, getSigner, getStorages, makeResolver) {
         const cachePath = this.inboxPathForUser(this.address);
-        const inboxFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, INBOX_DATA_FOLDER);
-        this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxFS, {
+        const inboxSyncedFS = await (0, fs_sync_utils_1.getOrMakeAndUploadFolderIn)(syncedFS, INBOX_DATA_FOLDER);
+        this.inbox = await inbox_1.InboxOnServer.makeAndStart(cachePath, inboxSyncedFS, {
             address: this.address,
             cryptor: this.cryptor,
             getSigner,
@@ -126,6 +126,7 @@ class ASMail {
     }
     ;
     async close() {
+        await this.inbox.close();
         await this.keyring.close();
     }
 }

package/build/core/asmail/keyring/correspondent-keys.js

@@ -26,6 +26,7 @@ const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const error_1 = require("../../../lib-common/exceptions/error");
 const async_cryptor_wrap_1 = require("../../../lib-common/async-cryptor-wrap");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 function generatePids() {
     const pids = [];
     for (let i = 0; i < 5; i += 1) {
@@ -35,7 +36,8 @@ function generatePids() {
 }
 function msgMasterDecryptor(cryptor, skey, pkey) {
     const msgMasterKey = calcMsgMasterKey(skey, pkey);
-    const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(cryptor, msgMasterKey);
+    const workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeRandom('asmail');
+    const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(cryptor, workLabel, msgMasterKey);
     msgMasterKey.fill(0);
     return masterDecr;
 }

package/build/core/asmail/keyring/index.d.ts

@@ -7,10 +7,7 @@ import { ResourcesForReceiving } from '../inbox';
 export { KEY_USE, MsgKeyRole } from './common';
 export interface MsgKeyInfo {
     correspondent: string;
-    /**
-     * This is a base64 form of key's byte array.
-     */
-    key?: string;
+    key?: Uint8Array;
     /**
      * This is a current status of the key in this keyring.
      */

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

@@ -28,6 +28,7 @@ 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");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 var common_3 = require("./common");
 Object.defineProperty(exports, "KEY_USE", { enumerable: true, get: function () { return common_3.KEY_USE; } });
 function makeAndKeyRing(cryptor, fs, publishedKeys) {
@@ -43,6 +44,7 @@ class KRing {
          */
         this.corrKeys = new Map();
         this.pairIdToEmailMap = new id_to_email_map_1.IdToEmailMap();
+        this.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeRandom('asmail');
         this.storage = undefined;
         this.asKeyPairsStorage = {
             pairIdToEmailMap: this.pairIdToEmailMap,
@@ -64,7 +66,7 @@ class KRing {
             const { msgMasterKey, currentPair, msgCount } = await ck.getSendingPair(introPKeyFromServer);
             // prepare message encryptor
             const nextNonce = await random.bytes(xsp_files_1.NONCE_LENGTH);
-            const encryptor = (0, async_cryptor_wrap_1.makeEncryptor)(this.cryptor, msgMasterKey, nextNonce);
+            const encryptor = (0, async_cryptor_wrap_1.makeEncryptor)(this.cryptor, this.workLabel, msgMasterKey, nextNonce);
             msgMasterKey.fill(0);
             return { encryptor, currentPair, msgCount };
         };
@@ -148,10 +150,9 @@ class KRing {
             const info = {
                 correspondent: undefined,
                 keyStatus: recipKey.role,
-                key: buffer_utils_1.base64.pack(mainObjFileKey),
+                key: mainObjFileKey,
                 msgKeyPackLen
             };
-            mainObjFileKey.fill(0);
             return info;
         }
         catch (err) {
@@ -195,7 +196,7 @@ class KRing {
         const h = await getMainObjHeader();
         for (const { correspondent, pair, role } of pairs) {
             const masterKey = buffer_utils_1.base64.open(pair.msgMasterKey);
-            const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(this.cryptor, masterKey);
+            const masterDecr = (0, async_cryptor_wrap_1.makeDecryptor)(this.cryptor, this.workLabel, masterKey);
             masterKey.fill(0);
             try {
                 const msgKeyPackLen = msgKeyPackLenForPair(pair);
@@ -206,10 +207,9 @@ class KRing {
                 const keyInfo = {
                     correspondent: correspondent,
                     keyStatus: role,
-                    key: buffer_utils_1.base64.pack(mainObjFileKey),
+                    key: mainObjFileKey,
                     msgKeyPackLen
                 };
-                mainObjFileKey.fill(0);
                 // set pair as in use
                 if (keyInfo.keyStatus === 'suggested') {
                     const corrKeys = this.corrKeys.get(keyInfo.correspondent);

package/build/core/asmail/msg/opener.js

@@ -20,6 +20,7 @@ exports.openMsg = exports.OpenedMsg = void 0;
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const error_1 = require("../../../lib-common/exceptions/error");
 const xsp_files_1 = require("xsp-files");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 class OpenedMsg {
     constructor(msgId, main) {
         this.msgId = msgId;
@@ -77,9 +78,9 @@ Object.freeze(OpenedMsg);
 async function openMsg(msgId, mainObjId, mainObj, headerOfs, fKey, cryptor) {
     try {
         const header = await mainObj.readHeader();
-        const segReader = await (0, xsp_files_1.makeSegmentsReader)(fKey, (0, xsp_files_1.idToHeaderNonce)(mainObjId), 0, header.subarray(headerOfs), cryptor);
-        const byteSrc = await (0, xsp_files_1.makeDecryptedByteSource)(mainObj.segSrc, segReader);
-        const bytes = await byteSrc.read(undefined);
+        const segReader = await (0, xsp_files_1.makeSegmentsReader)(fKey, (0, xsp_files_1.idToHeaderNonce)(mainObjId), 0, header.subarray(headerOfs), cryptor, cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', msgId));
+        const byteSrc = (0, xsp_files_1.makeDecryptedByteSource)(mainObj.segSrc, segReader);
+        const bytes = await byteSrc.readNext(undefined);
         if (!bytes) {
             throw new Error(`End of bytes is reached too soon`);
         }

package/build/core/asmail/msg/packer.d.ts

@@ -52,6 +52,7 @@ export declare class MsgPacker {
     private hasAttachments;
     private attachmentsFS;
     private attachmentsCont;
+    private workLabel;
     private constructor();
     static empty(segSizeIn256bs: number): MsgPacker;
     static fromPack(p: PackJSON, segSizeIn256bs: number, att: undefined | {

package/build/core/asmail/msg/packer.js

@@ -24,6 +24,7 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const folder_node_serialization_1 = require("../../../lib-client/3nstorage/xsp-fs/folder-node-serialization");
 const json_utils_1 = require("../../../lib-common/json-utils");
 const attachments_container_1 = require("./attachments-container");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 function turnKeysToB64(obj) {
     obj.key = buffer_utils_1.base64.pack(obj.key);
     if (!obj.folder) {
@@ -88,6 +89,7 @@ class MsgPacker {
             'From': undefined
         };
         this.mainObjId = this.addJsonObj(this.main);
+        this.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', this.mainObjId);
         Object.seal(this);
     }
     static empty(segSizeIn256bs) {
@@ -97,6 +99,7 @@ class MsgPacker {
         const packer = new MsgPacker(segSizeIn256bs);
         packer.readyPack = p;
         packer.mainObjId = p.meta.objIds[0];
+        packer.workLabel = cryptor_work_labels_1.cryptoWorkLabels.makeFor('asmail', packer.mainObjId);
         Object.values((0, json_utils_1.copy)(p.objs))
             .forEach(obj => {
             packer.allObjs.set(obj.id, obj);
@@ -347,7 +350,7 @@ class MsgPacker {
         }
         const msgKeyPack = await msgKeyEnc.pack(obj.key);
         const bytes = buffer_utils_1.utf8.pack(JSON.stringify(obj.json));
-        const segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
+        const segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor, this.workLabel);
         // make source that inserts message key pack into header
         return makeMainObjSrc(msgKeyPack, bytes, segWriter);
     }
@@ -410,10 +413,10 @@ class MsgPacker {
         // make object segments writer
         let segWriter;
         if (header) {
-            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'restart', header }, random.bytes, cryptor);
+            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'restart', header }, random.bytes, cryptor, this.workLabel);
         }
         else {
-            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor);
+            segWriter = await (0, xsp_files_1.makeSegmentsWriter)(obj.key, (0, xsp_files_1.idToHeaderNonce)(obj.id), 0, { type: 'new', segSize: this.segSizeIn256bs, payloadFormat: 1 }, random.bytes, cryptor, this.workLabel);
         }
         // make object source
         let src;
@@ -492,7 +495,8 @@ function fileSrcToByteSrc(fileSrc) {
                 size: await fileSrc.getSize()
             };
         },
-        read: fileSrc.read,
+        readNext: fileSrc.readNext,
+        readAt: fileSrc.readAt,
         seek: fileSrc.seek
     };
 }

package/build/core/index.js

@@ -120,9 +120,8 @@ class Core {
         const initFromSignUp$ = signUp.newUser$
             .pipe((0, operators_1.mergeMap)(this.initForNewUser, 1));
         const initFromSignIn$ = signIn.existingUser$;
-        const coreInit = (0, rxjs_1.merge)(initFromSignIn$, initFromSignUp$)
-            .pipe((0, operators_1.take)(1), (0, operators_1.mergeMap)(idManager => this.initCore(idManager), 1))
-            .toPromise();
+        const coreInit = (0, rxjs_1.lastValueFrom)((0, rxjs_1.merge)(initFromSignIn$, initFromSignUp$)
+            .pipe((0, operators_1.take)(1), (0, operators_1.mergeMap)(idManager => this.initCore(idManager), 1)));
         return { coreInit, capsForStartup };
     }
     ;

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

@@ -24,6 +24,7 @@ const path_1 = require("path");
 const obj_files_gc_1 = require("./obj-files-gc");
 const obj_status_1 = require("./obj-status");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
+const rxjs_1 = require("rxjs");
 class ObjFiles {
     constructor(folders, logError) {
         this.folders = folders;
@@ -140,7 +141,7 @@ class LocalObj {
         const fPath = this.path(version);
         const { obj, write$ } = await obj_on_disk_1.ObjOnDisk.createFileForWriteOfNewVersion(this.objId, version, fPath, encSub, undefined, this.objSegsGetterFromDisk);
         try {
-            await write$.toPromise();
+            await (0, rxjs_1.lastValueFrom)(write$);
         }
         catch (err) {
             if (this.verObjs.get(version) === obj) {

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

@@ -26,6 +26,7 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const xsp_files_1 = require("xsp-files");
 const remote_events_1 = require("./remote-events");
 const upsyncer_1 = require("./upsyncer");
+const rxjs_1 = require("rxjs");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 class SyncedStore {
     constructor(files, remoteStorage, getStorages, cryptor, logError) {
@@ -216,12 +217,12 @@ class SyncedStore {
                 throw (0, exceptions_1.makeObjExistsExc)(objId);
             }
             const { fileWrite$ } = await this.files.saveFirstVersion(objId, encSub);
-            await fileWrite$.toPromise();
+            await (0, rxjs_1.lastValueFrom)(fileWrite$);
         }
         else {
             const obj = await this.getObjOrThrow(objId);
             const { fileWrite$ } = await obj.saveNewVersion(version, encSub);
-            await fileWrite$.toPromise();
+            await (0, rxjs_1.lastValueFrom)(fileWrite$);
         }
     }
     async removeObj(objId) {

package/build/core/storage/synced/upload-header-file.js

@@ -25,12 +25,14 @@ const assert_1 = require("../../../lib-common/assert");
 exports.UPLOAD_HEADER_FILE_NAME_EXT = 'upload';
 async function saveUploadHeaderFile(objFolder, headers) {
     const bytes = packUploadHeaderChange(headers);
-    await (0, async_fs_node_1.writeFile)(uploadHeaderFilePath(objFolder, headers.uploadVersion), bytes);
+    const upFile = uploadHeaderFilePath(objFolder, headers.uploadVersion);
+    await (0, async_fs_node_1.writeFile)(upFile, bytes);
 }
 exports.saveUploadHeaderFile = saveUploadHeaderFile;
 async function readUploadHeaderFromFile(objFolder, uploadVersion) {
     try {
-        const bytes = await (0, async_fs_node_1.readFile)(uploadHeaderFilePath(objFolder, uploadVersion));
+        const upFile = uploadHeaderFilePath(objFolder, uploadVersion);
+        const bytes = await (0, async_fs_node_1.readFile)(upFile);
         return unpackUploadHeaderChange(bytes);
     }
     catch (exc) {

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

@@ -161,8 +161,7 @@ class UploadTask {
         const header = await this.headerToUpload();
         let segs = undefined;
         if (segsToUpload > 0) {
-            await this.src.segSrc.seek(upload.segsOfs);
-            segs = await this.src.segSrc.read(segsToUpload);
+            segs = await this.src.segSrc.readAt(upload.segsOfs, segsToUpload);
         }
         (0, assert_1.assert)(!!segs && (segs.length === segsToUpload));
         const ver = this.info.uploadVersion;
@@ -210,8 +209,7 @@ class UploadTask {
     }
     async continueOrderedUpload(upload) {
         const segsToUpload = Math.min(upload.segsLeft, this.maxUploadChunk());
-        await this.src.segSrc.seek(upload.segsOfs);
-        const segs = await this.src.segSrc.read(segsToUpload);
+        const segs = await this.src.segSrc.readAt(upload.segsOfs, segsToUpload);
         (0, assert_1.assert)(!!segs && (segs.length === segsToUpload));
         const ofs = upload.segsOfs;
         const trans = upload.transactionId;
@@ -230,7 +228,7 @@ class UploadTask {
         const segInfo = upload.newSegsLeft[0];
         (0, assert_1.assert)(!!segInfo);
         const len = Math.min(maxSegs, segInfo.len);
-        const segs = await this.src.segSrc.read(len);
+        const segs = await this.src.segSrc.readAt(segInfo.thisVerOfs, len);
         (0, assert_1.assert)(!!segs && (segs.length === len));
         if (segInfo.len > len) {
             upload.newSegsLeft.splice(1, 0, {

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

@@ -49,9 +49,8 @@ function exposeASMailCAP(cap, expServices) {
 }
 exports.exposeASMailCAP = exposeASMailCAP;
 function makeASMailCaller(caller, objPath) {
-    const delivPath = objPath.concat('delivery');
-    const inboxPath = objPath.concat('inbox');
-    const connectPath = objPath.concat('connect');
+    const delivPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'delivery');
+    const inboxPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'inbox');
     return {
         getUserId: getUserId.makeCaller(caller, objPath),
         delivery: {
@@ -83,7 +82,7 @@ var getUserId;
     }
     getUserId.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getUserId');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getUserId');
         return () => caller.startPromiseCall(path, undefined)
             .then(buf => {
             if (!buf) {
@@ -116,7 +115,7 @@ var inboxListMsgs;
     }
     inboxListMsgs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('listMsgs');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'listMsgs');
         return fromTS => {
             const req = (fromTS ? { fromTS: (0, protobuf_msg_1.toVal)(fromTS) } : {});
             return caller
@@ -139,7 +138,7 @@ var removeMsg;
     }
     removeMsg.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('removeMsg');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'removeMsg');
         return async (msgId) => {
             await caller.startPromiseCall(path, requestType.pack({ msgId }));
         };
@@ -160,7 +159,7 @@ var getMsg;
     }
     getMsg.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getMsg');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getMsg');
         return msgId => caller
             .startPromiseCall(path, requestType.pack({ msgId }))
             .then(buf => unpackIncomingMessage(buf, caller));
@@ -220,7 +219,7 @@ var inboxSubscribe;
     }
     inboxSubscribe.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('subscribe');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'subscribe');
         return (event, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, requestType.pack({ event }), s);
@@ -246,7 +245,7 @@ var preFlight;
     }
     preFlight.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('preFlight');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'preFlight');
         return toAddress => caller
             .startPromiseCall(path, requestType.pack({ toAddress }))
             .then(protobuf_msg_1.unpackInt);
@@ -341,7 +340,7 @@ var addMsg;
     }
     addMsg.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('addMsg');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'addMsg');
         return async (recipients, msg, id, opts) => {
             const req = { id, msg: packMsg(msg, caller), recipients };
             if (opts) {
@@ -369,7 +368,7 @@ var delivListMsgs;
     }
     delivListMsgs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('listMsgs');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'listMsgs');
         return () => caller
             .startPromiseCall(path, undefined)
             .then(buf => {
@@ -438,7 +437,7 @@ var currentState;
     }
     currentState.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('currentState');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'currentState');
         return id => caller
             .startPromiseCall(path, requestType.pack({ id }))
             .then(buf => {
@@ -463,7 +462,7 @@ var rmMsg;
     }
     rmMsg.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('rmMsg');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'rmMsg');
         return (id, cancelSending) => caller
             .startPromiseCall(path, requestType.pack({
             id, cancelSending: (0, protobuf_msg_1.toOptVal)(cancelSending)
@@ -488,7 +487,7 @@ var observeAllDeliveries;
     }
     observeAllDeliveries.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('observeAllDeliveries');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'observeAllDeliveries');
         return obs => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, undefined, s);
@@ -520,7 +519,7 @@ var observeDelivery;
     }
     observeDelivery.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('observeDelivery');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'observeDelivery');
         return (id, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, requestType.pack({ id }), s);

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

@@ -53,7 +53,8 @@ function makeSrcCaller(caller, ref) {
     const src = {
         getPosition: srcGetPosition.makeCaller(caller, objPath),
         getSize: srcGetSize.makeCaller(caller, objPath),
-        read: srcRead.makeCaller(caller, objPath),
+        readNext: srcReadNext.makeCaller(caller, objPath),
+        readAt: srcReadAt.makeCaller(caller, objPath),
         seek: srcSeek.makeCaller(caller, objPath)
     };
     caller.registerClientDrop(src, ref);
@@ -64,7 +65,8 @@ function exposeSrcService(src, expServices) {
     const wrap = {
         getPosition: srcGetPosition.wrapService(src.getPosition),
         getSize: srcGetSize.wrapService(src.getSize),
-        read: srcRead.wrapService(src.read),
+        readNext: srcReadNext.wrapService(src.readNext),
+        readAt: srcReadAt.wrapService(src.readAt),
         seek: srcSeek.wrapService(src.seek)
     };
     const ref = expServices.exposeDroppableService('FileByteSource', wrap, src);
@@ -82,7 +84,7 @@ var sinkGetSize;
     }
     sinkGetSize.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getSize');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getSize');
         return () => caller
             .startPromiseCall(path, undefined)
             .then(protobuf_msg_1.unpackInt);
@@ -102,7 +104,7 @@ var sinkSplice;
     }
     sinkSplice.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('splice');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'splice');
         return async (pos, del, bytes) => {
             await caller
                 .startPromiseCall(path, requestType.pack({
@@ -125,7 +127,7 @@ var sinkTruncate;
     }
     sinkTruncate.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('truncate');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'truncate');
         return async (size) => {
             await caller
                 .startPromiseCall(path, requestType.pack({ size }));
@@ -160,7 +162,7 @@ var sinkShowLayout;
     }
     sinkShowLayout.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('showLayout');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'showLayout');
         return () => caller
             .startPromiseCall(path, undefined)
             .then(buf => unpackLayout(replyType.unpack(buf)));
@@ -180,7 +182,7 @@ var sinkDone;
     }
     sinkDone.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('done');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'done');
         return async (err) => {
             const req = (err ? { err: (0, protobuf_msg_1.errToMsg)(err) } : {});
             await caller
@@ -201,7 +203,7 @@ var srcGetSize;
     }
     srcGetSize.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getSize');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getSize');
         return () => caller
             .startPromiseCall(path, undefined)
             .then(protobuf_msg_1.unpackInt);
@@ -220,7 +222,7 @@ var srcGetPosition;
     }
     srcGetPosition.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getPosition');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getPosition');
         return () => caller
             .startPromiseCall(path, undefined)
             .then(protobuf_msg_1.unpackInt);
@@ -228,9 +230,9 @@ var srcGetPosition;
     srcGetPosition.makeCaller = makeCaller;
 })(srcGetPosition || (srcGetPosition = {}));
 Object.freeze(srcGetPosition);
-var srcRead;
-(function (srcRead) {
-    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadRequestBody);
+var srcReadNext;
+(function (srcReadNext) {
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadNextRequestBody);
     const replyType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadReplyBody);
     function wrapService(fn) {
         return buf => {
@@ -240,16 +242,38 @@ var srcRead;
             return { promise };
         };
     }
-    srcRead.wrapService = wrapService;
+    srcReadNext.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('read');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'readNext');
         return len => caller
             .startPromiseCall(path, requestType.pack({ len: (0, protobuf_msg_1.toOptVal)(len) }))
             .then(buf => (0, protobuf_msg_1.valOfOpt)(replyType.unpack(buf).bytes));
     }
-    srcRead.makeCaller = makeCaller;
-})(srcRead || (srcRead = {}));
-Object.freeze(srcRead);
+    srcReadNext.makeCaller = makeCaller;
+})(srcReadNext || (srcReadNext = {}));
+Object.freeze(srcReadNext);
+var srcReadAt;
+(function (srcReadAt) {
+    const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadAtRequestBody);
+    const replyType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.ReadReplyBody);
+    function wrapService(fn) {
+        return buf => {
+            const { pos, len } = requestType.unpack(buf);
+            const promise = fn((0, protobuf_msg_1.fixInt)(pos), (0, protobuf_msg_1.valOfOptInt)(len))
+                .then(bytes => replyType.pack({ bytes: (0, protobuf_msg_1.toOptVal)(bytes) }));
+            return { promise };
+        };
+    }
+    srcReadAt.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'readAt');
+        return (pos, len) => caller
+            .startPromiseCall(path, requestType.pack({ pos, len: (0, protobuf_msg_1.toOptVal)(len) }))
+            .then(buf => (0, protobuf_msg_1.valOfOpt)(replyType.unpack(buf).bytes));
+    }
+    srcReadAt.makeCaller = makeCaller;
+})(srcReadAt || (srcReadAt = {}));
+Object.freeze(srcReadAt);
 var srcSeek;
 (function (srcSeek) {
     const requestType = protobuf_type_1.ProtoType.for(bytes_proto_1.bytes.SeekRequestBody);
@@ -262,7 +286,7 @@ var srcSeek;
     }
     srcSeek.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('seek');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'seek');
         return async (offset) => {
             await caller
                 .startPromiseCall(path, requestType.pack({ offset }));