core-3nweb-client-lib 0.27.3 → 0.27.5

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) {
@@ -47,8 +48,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 +59,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 +123,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);
@@ -233,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 }));

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;