core-3nweb-client-lib 0.27.0 → 0.27.4

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) };

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

@@ -261,10 +261,10 @@ var stat;
 Object.freeze(stat);
 var getXAttr;
 (function (getXAttr) {
-    getXAttr.requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.GetXAttrRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.GetXAttrRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, xaName } = getXAttr.requestType.unpack(buf);
+            const { path, xaName } = requestType.unpack(buf);
             const promise = fn(path, xaName)
                 .then(file_1.packXAttrValue);
             return { promise };
@@ -274,7 +274,7 @@ var getXAttr;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('getXAttr');
         return (path, xaName) => caller
-            .startPromiseCall(ipcPath, getXAttr.requestType.pack({ path, xaName }))
+            .startPromiseCall(ipcPath, requestType.pack({ path, xaName }))
             .then(file_1.unpackXAttrValue);
     }
     getXAttr.makeCaller = makeCaller;
@@ -695,10 +695,10 @@ var readTxtFile;
 Object.freeze(readTxtFile);
 var readBytes;
 (function (readBytes) {
-    readBytes.requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ReadBytesRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.ReadBytesRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, start, end } = readBytes.requestType.unpack(buf);
+            const { path, start, end } = requestType.unpack(buf);
             const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
                 .then(file.readBytes.packReply);
             return { promise };
@@ -708,7 +708,7 @@ var readBytes;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('readBytes');
         return (path, start, end) => caller
-            .startPromiseCall(ipcPath, readBytes.requestType.pack({
+            .startPromiseCall(ipcPath, requestType.pack({
             path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
         }))
             .then(file.readBytes.unpackReply);
@@ -1169,12 +1169,27 @@ var fsItem;
     fsItem.fsItemFromMsg = fsItemFromMsg;
 })(fsItem = exports.fsItem || (exports.fsItem = {}));
 Object.freeze(fsItem);
+const reqWithPathAndFlagsType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.PathAndFlagsRequestBody);
+function packRequestWithPathAndFlags(path, flags) {
+    return reqWithPathAndFlagsType.pack({
+        path,
+        flags: file.versionedReadFlagsToMsg(flags)
+    });
+}
+function unpackRequestWithPathAndFlags(buf) {
+    const { path, flags } = reqWithPathAndFlagsType.unpack(buf);
+    return {
+        path,
+        flags: file.versionedReadFlagsFromMsg(flags)
+    };
+}
 var vGetXAttr;
 (function (vGetXAttr) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedGetXAttrRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, xaName } = getXAttr.requestType.unpack(buf);
-            const promise = fn(path, xaName)
+            const { path, xaName, flags } = requestType.unpack(buf);
+            const promise = fn(path, xaName, file.versionedReadFlagsFromMsg(flags))
                 .then(attrAndVer => file.vGetXAttr.replyType.pack(attrAndVer));
             return { promise };
         };
@@ -1182,8 +1197,10 @@ var vGetXAttr;
     vGetXAttr.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('getXAttr');
-        return (path, xaName) => caller
-            .startPromiseCall(ipcPath, getXAttr.requestType.pack({ path, xaName }))
+        return (path, xaName, flags) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, xaName, flags: file.versionedReadFlagsToMsg(flags)
+        }))
             .then(file.vGetXAttr.unpackReply);
     }
     vGetXAttr.makeCaller = makeCaller;
@@ -1193,8 +1210,8 @@ var vListXAttrs;
 (function (vListXAttrs) {
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(({ version, lst }) => file.vListXAttrs.replyType.pack({ version, xaNames: lst }));
             return { promise };
         };
@@ -1202,8 +1219,8 @@ var vListXAttrs;
     vListXAttrs.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('listXAttrs');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, xaNames } = file.vListXAttrs.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), lst: (xaNames ? xaNames : []) };
@@ -1217,8 +1234,8 @@ var vListFolder;
     const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedListFolderReplyBody);
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(({ version, lst }) => replyType.pack({
                 version, entries: lst.map(lsEntryToMsg)
             }));
@@ -1228,8 +1245,8 @@ var vListFolder;
     vListFolder.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('listFolder');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, entries } = replyType.unpack(buf);
             return {
@@ -1244,8 +1261,8 @@ var vReadJSONFile;
 (function (vReadJSONFile) {
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(({ version, json }) => {
                 return file.vReadJSON.replyType.pack({ version, json: JSON.stringify(json) });
             });
@@ -1255,8 +1272,8 @@ var vReadJSONFile;
     vReadJSONFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('readJSONFile');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, json } = file.vReadJSON.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), json: JSON.parse(json) };
@@ -1269,8 +1286,8 @@ var vReadTxtFile;
 (function (vReadTxtFile) {
     function wrapService(fn) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
-            const promise = fn(path)
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
+            const promise = fn(path, flags)
                 .then(verAndTxt => file.vReadTxt.replyType.pack(verAndTxt));
             return { promise };
         };
@@ -1278,8 +1295,8 @@ var vReadTxtFile;
     vReadTxtFile.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('readTxtFile');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, txt } = file.vReadTxt.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), txt };
@@ -1290,10 +1307,11 @@ var vReadTxtFile;
 Object.freeze(vReadTxtFile);
 var vReadBytes;
 (function (vReadBytes) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.VersionedReadBytesRequestBody);
     function wrapService(fn) {
         return buf => {
-            const { path, start, end } = readBytes.requestType.unpack(buf);
-            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end))
+            const { path, start, end, flags } = requestType.unpack(buf);
+            const promise = fn(path, (0, protobuf_msg_1.valOfOptInt)(start), (0, protobuf_msg_1.valOfOptInt)(end), file.versionedReadFlagsFromMsg(flags))
                 .then(file.vReadBytes.packReply);
             return { promise };
         };
@@ -1301,13 +1319,12 @@ var vReadBytes;
     vReadBytes.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('readBytes');
-        return (path, start, end) => {
-            return caller
-                .startPromiseCall(ipcPath, readBytes.requestType.pack({
-                path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end)
-            }))
-                .then(file.vReadBytes.unpackReply);
-        };
+        return (path, start, end, flags) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, start: (0, protobuf_msg_1.toOptVal)(start), end: (0, protobuf_msg_1.toOptVal)(end),
+            flags: file.versionedReadFlagsToMsg(flags)
+        }))
+            .then(file.vReadBytes.unpackReply);
     }
     vReadBytes.makeCaller = makeCaller;
 })(vReadBytes || (vReadBytes = {}));
@@ -1316,7 +1333,7 @@ var vGetByteSource;
 (function (vGetByteSource) {
     function wrapService(fn, expServices) {
         return buf => {
-            const { path } = reqWithPathType.unpack(buf);
+            const { path, flags } = unpackRequestWithPathAndFlags(buf);
             const promise = fn(path)
                 .then(({ version, src }) => {
                 const ref = (0, bytes_1.exposeSrcService)(src, expServices);
@@ -1328,8 +1345,8 @@ var vGetByteSource;
     vGetByteSource.wrapService = wrapService;
     function makeCaller(caller, objPath) {
         const ipcPath = objPath.concat('getByteSource');
-        return path => caller
-            .startPromiseCall(ipcPath, reqWithPathType.pack({ path }))
+        return (path, flags) => caller
+            .startPromiseCall(ipcPath, packRequestWithPathAndFlags(path, flags))
             .then(buf => {
             const { version: v, src } = file.vGetByteSource.replyType.unpack(buf);
             return { version: (0, protobuf_msg_1.fixInt)(v), src: (0, bytes_1.makeSrcCaller)(caller, src) };

package/build/lib-client/3nstorage/exceptions.d.ts

@@ -6,6 +6,7 @@ export interface StorageException extends web3n.RuntimeException {
     objId?: ObjId;
     version?: number;
     objNotFound?: true;
+    objVersionNotFound?: true;
     objExists?: true;
     concurrentTransaction?: true;
     unknownTransaction?: true;
@@ -13,8 +14,19 @@ export interface StorageException extends web3n.RuntimeException {
     currentVersion?: number;
     storageIsClosed?: true;
 }
+export interface StorageExceptionFlags {
+    remoteStorage?: true;
+    objNotFound?: true;
+    objVersionNotFound?: true;
+    objExists?: true;
+    concurrentTransaction?: true;
+    unknownTransaction?: true;
+    versionMismatch?: true;
+    storageIsClosed?: true;
+}
 export declare function makeStorageException(fields: Partial<StorageException>): StorageException;
-export declare function makeObjNotFoundExc(objId: ObjId, version?: number, remoteStorage?: true): StorageException;
+export declare function makeObjNotFoundExc(objId: ObjId, remoteStorage?: true): StorageException;
+export declare function makeObjVersionNotFoundExc(objId: ObjId, version: number, remoteStorage?: true): StorageException;
 export declare function makeObjExistsExc(objId: ObjId, version?: number, remoteStorage?: true): StorageException;
 export declare function makeConcurrentTransExc(objId: ObjId): StorageException;
 export declare function makeUnknownTransactionExc(objId: ObjId): StorageException;

package/build/lib-client/3nstorage/exceptions.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeFSSyncException = exports.makeStorageIsClosedExc = exports.makeVersionMismatchExc = exports.makeUnknownTransactionExc = exports.makeConcurrentTransExc = exports.makeObjExistsExc = exports.makeObjNotFoundExc = exports.makeStorageException = void 0;
+exports.makeFSSyncException = exports.makeStorageIsClosedExc = exports.makeVersionMismatchExc = exports.makeUnknownTransactionExc = exports.makeConcurrentTransExc = exports.makeObjExistsExc = exports.makeObjVersionNotFoundExc = exports.makeObjNotFoundExc = exports.makeStorageException = void 0;
 function makeStorageException(fields) {
     const exc = {
         runtimeException: true,
@@ -28,12 +28,18 @@ function makeStorageException(fields) {
     return exc;
 }
 exports.makeStorageException = makeStorageException;
-function makeObjNotFoundExc(objId, version, remoteStorage) {
+function makeObjNotFoundExc(objId, remoteStorage) {
     return makeStorageException({
-        objId, version, objNotFound: true, remoteStorage
+        objId, objNotFound: true, remoteStorage
     });
 }
 exports.makeObjNotFoundExc = makeObjNotFoundExc;
+function makeObjVersionNotFoundExc(objId, version, remoteStorage) {
+    return makeStorageException({
+        objId, version, objVersionNotFound: true, remoteStorage
+    });
+}
+exports.makeObjVersionNotFoundExc = makeObjVersionNotFoundExc;
 function makeObjExistsExc(objId, version, remoteStorage) {
     return makeStorageException({
         objId, version, objExists: true, remoteStorage

package/build/lib-client/3nstorage/service.d.ts

@@ -11,7 +11,12 @@ export declare type FirstSaveReqOpts = api.PutObjFirstQueryOpts;
 export declare type FollowingSaveReqOpts = api.PutObjSecondQueryOpts;
 export declare class StorageOwner extends ServiceUser {
     maxChunkSize: number | undefined;
-    constructor(user: string, getSigner: IGetMailerIdSigner, mainUrlGetter: () => Promise<string>, net: NetClient);
+    private constructor();
+    static make(user: string, getSigner: IGetMailerIdSigner, mainUrlGetter: () => Promise<string>, net: NetClient): StorageOwner;
+    static makeBeforeMidSetup(user: string, mainUrlGetter: () => Promise<string>, net: NetClient): {
+        remote: StorageOwner;
+        setMid: (getSigner: IGetMailerIdSigner) => void;
+    };
     getKeyDerivParams(): Promise<keyGen.ScryptGenParams>;
     private setSessionParams;
     /**
@@ -63,7 +68,6 @@ export declare class StorageOwner extends ServiceUser {
      * @param bytes is an object with header, diff and segs bytes to upload
      */
     saveNewObjVersion(objId: ObjId, fstReq: {
-        create?: true;
         ver: number;
         last?: true;
     } | undefined, followReq: {

package/build/lib-client/3nstorage/service.js

@@ -28,23 +28,39 @@ const keyGen = require("../key-derivation");
 const exceptions_1 = require("./exceptions");
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
 const assert_1 = require("../../lib-common/assert");
+function toInitServiceUriGetter(net, mainUrlGetter) {
+    return async () => {
+        const serviceUrl = await mainUrlGetter();
+        const info = await (0, service_locator_1.storageInfoAt)(net, serviceUrl);
+        if (!info.owner) {
+            throw new Error(`Missing owner service url in 3NStorage information at ${serviceUrl}`);
+        }
+        return info.owner;
+    };
+}
 class StorageOwner extends user_with_mid_session_1.ServiceUser {
-    constructor(user, getSigner, mainUrlGetter, net) {
+    constructor(user, getSigner, getInitServiceURI, net) {
         super(user, {
             login: api.midLogin.MID_URL_PART,
             logout: api.closeSession.URL_END,
             canBeRedirected: true
-        }, getSigner, async () => {
-            const serviceUrl = await mainUrlGetter();
-            const info = await (0, service_locator_1.storageInfoAt)(this.net, serviceUrl);
-            if (!info.owner) {
-                throw new Error(`Missing owner service url in 3NStorage information at ${serviceUrl}`);
-            }
-            return info.owner;
-        }, net);
+        }, getSigner, getInitServiceURI, net);
         this.maxChunkSize = undefined;
         Object.seal(this);
     }
+    static make(user, getSigner, mainUrlGetter, net) {
+        const srvUriGetter = toInitServiceUriGetter(net, mainUrlGetter);
+        const remote = new StorageOwner(user, getSigner, srvUriGetter, net);
+        return remote;
+    }
+    static makeBeforeMidSetup(user, mainUrlGetter, net) {
+        const srvUriGetter = toInitServiceUriGetter(net, mainUrlGetter);
+        const remote = new StorageOwner(user, undefined, srvUriGetter, net);
+        return {
+            remote,
+            setMid: getSigner => remote.setGetterOfSigner(getSigner)
+        };
+    }
     async getKeyDerivParams() {
         const rep = await this.doBodylessSessionRequest({
             appPath: api.keyDerivParams.URL_END,
@@ -144,7 +160,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             };
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
@@ -179,7 +195,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return rep.data;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
@@ -199,9 +215,9 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
         let appPath;
         if (fstReq) {
             (0, assert_1.assert)(!!header);
-            const { create, ver, last } = fstReq;
+            const { ver, last } = fstReq;
             const reqOpts = {
-                create, ver, last,
+                ver, last,
                 header: header.length,
                 diff: (diff ? diff.length : undefined)
             };
@@ -246,7 +262,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw (0, exceptions_1.makeObjExistsExc)(objId, undefined, true);
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else if (rep.status === api.currentObj.SC.concurrentTransaction) {
             throw (0, exceptions_1.makeConcurrentTransExc)(objId);
@@ -276,10 +292,10 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else if (rep.status === api.currentObj.SC.unknownObjVer) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, currentVer, true);
+            throw (0, exceptions_1.makeObjVersionNotFoundExc)(objId, currentVer, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
@@ -298,7 +314,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return rep.data;
         }
         else if (rep.status === api.objStatus.SC.unknownObj) {
-            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, true);
         }
         else {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');

package/build/lib-client/3nstorage/util/file-based-json.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.JsonFileProc = void 0;
 const rxjs_1 = require("rxjs");

package/build/lib-client/3nstorage/util/for-arrays.d.ts

@@ -0,0 +1 @@
+export declare function appendArray<T>(arr: T[], elems: T[] | T | undefined): T[];

package/build/lib-client/3nstorage/util/for-arrays.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ Copyright (C) 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appendArray = void 0;
+function appendArray(arr, elems) {
+    if (elems !== undefined) {
+        if (Array.isArray(elems)) {
+            arr.push(...elems);
+        }
+        else {
+            arr.push(elems);
+        }
+    }
+    return arr;
+}
+exports.appendArray = appendArray;
+Object.freeze(exports);