core-3nweb-client-lib 0.27.1 → 0.27.3

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

@@ -22,6 +22,7 @@ const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
 const json_saving_1 = require("../common/json-saving");
 const obj_info_file_1 = require("../common/obj-info-file");
 const assert_1 = require("../../../lib-common/assert");
+const file_1 = require("../../../lib-common/exceptions/file");
 function makeVersions() {
     return {
         baseToDiff: {},
@@ -81,12 +82,14 @@ function identifyNonGarbage(status) {
     let uploadVersion = undefined;
     if (status.local) {
         local = nonGarbageWithMaxVer(status.local);
-        if (status.local.upload) {
-            const { localVersion } = status.local.upload;
-            if (status.local.current !== localVersion) {
-                (0, obj_info_file_1.addWithBasesTo)(local.nonGarbage, localVersion, status.local);
-            }
-            uploadVersion = status.local.upload.uploadVersion;
+    }
+    if (status.upload) {
+        const { localVersion } = status.upload;
+        if (status.local.current !== localVersion) {
+            (0, obj_info_file_1.addWithBasesTo)(local.nonGarbage, localVersion, status.local);
+        }
+        if (status.upload.type === 'new-version') {
+            uploadVersion = status.upload.uploadVersion;
         }
     }
     const remote = nonGarbageWithMaxVer(status.remote);
@@ -136,6 +139,27 @@ class ObjStatus {
         const status = await readAndCheckStatus(objFolder, objId);
         return (syncStateOf(status) !== 'synced');
     }
+    static async fileShowsObjNeedsRemovalOnRemote(objFolder, objId) {
+        const status = await readAndCheckStatus(objFolder, objId);
+        const upload = status.upload;
+        return (((upload === null || upload === void 0 ? void 0 : upload.type) === 'removal') && !upload.isPostponed);
+    }
+    needsRemovalOnRemote() {
+        const upload = this.status.upload;
+        return (((upload === null || upload === void 0 ? void 0 : upload.type) === 'removal') && !upload.isPostponed);
+    }
+    async clearPostponeFlagInRemovalOnRemote() {
+        const { upload } = this.status;
+        if (!upload) {
+            return false;
+        }
+        if (upload.type !== 'removal') {
+            throw new Error(`No upload removal in obj status`);
+        }
+        upload.isPostponed = false;
+        await this.triggerSaveProc();
+        return true;
+    }
     updateStateIndicator() {
         this.stateIndicator = syncStateOf(this.status);
     }
@@ -162,28 +186,36 @@ class ObjStatus {
         return identifyNonGarbage(this.status);
     }
     async removeCurrentVersion() {
-        let { local, synced } = this.status;
+        let { local, synced, remote, upload } = this.status;
         if ((synced === null || synced === void 0 ? void 0 : synced.isArchived) || (local === null || local === void 0 ? void 0 : local.isArchived)) {
             return;
         }
+        if (upload) {
+            if (upload.type === 'removal') {
+                return;
+            }
+            else {
+                throw (0, file_1.makeFileException)('concurrentUpdate', 'obj-status', `Upload is in progress`);
+            }
+        }
+        if (!remote.isArchived && remote.current) {
+            this.status.upload = {
+                type: 'removal',
+                localVersion: ((local === null || local === void 0 ? void 0 : local.current) || (synced === null || synced === void 0 ? void 0 : synced.version)),
+                isPostponed: true
+            };
+            upload = this.status.upload;
+        }
         if (local) {
-            (0, obj_info_file_1.rmCurrentVersionIn)(local);
+            local.isArchived = true;
+            local.current = undefined;
         }
         else {
-            local = makeVersions();
+            this.status.local = makeVersions();
+            this.status.local.isArchived = true;
         }
-        local.isArchived = true;
         this.updateStateIndicator();
-        ;
-        await this.triggerSaveProc().catch((exc) => {
-            var _a;
-            if (exc.notFound && ((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.isArchived)) {
-                return;
-            }
-            else {
-                throw exc;
-            }
-        });
+        await this.triggerSaveProc().catch(skipNotFoundExc);
     }
     async triggerSaveProc(captureErrors = false, logErr = false) {
         try {
@@ -201,16 +233,17 @@ class ObjStatus {
         }
     }
     recordUploadStart(info) {
-        (0, assert_1.assert)(!!this.status.local);
-        const local = this.status.local;
-        if (local.upload) {
+        var _a;
+        if (this.status.upload) {
+            const upload = this.status.upload;
             throw (0, exceptions_1.makeFSSyncException)('obj-status', {
                 alreadyUploading: true,
-                message: `Status already has upload of version ${local.upload.uploadVersion} and can't start another upload with version ${info.uploadVersion}`
+                message: `Status already has upload of version ${upload.uploadVersion} and can't start another upload with version ${info.uploadVersion}`
             });
         }
-        if (info.localVersion === local.current) {
-            local.upload = info;
+        if (info.localVersion === ((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.current)) {
+            this.status.upload = info;
+            return this.triggerSaveProc();
         }
         else {
             throw (0, exceptions_1.makeFSSyncException)('obj-status', {
@@ -218,22 +251,58 @@ class ObjStatus {
                 versionNotFound: true
             });
         }
-        return this.triggerSaveProc();
     }
     recordUploadInterimState(info) {
-        (0, assert_1.assert)(!!this.status.local);
-        const local = this.status.local;
-        (0, assert_1.assert)(!!local.upload &&
-            (local.upload.uploadVersion === info.uploadVersion));
-        local.upload = info;
-        return this.triggerSaveProc();
+        var _a;
+        if (((_a = this.status.upload) === null || _a === void 0 ? void 0 : _a.type) !== 'new-version') {
+            throw new Error(`No new version upload in object status`);
+        }
+        if (this.status.upload.uploadVersion === info.uploadVersion) {
+            this.status.upload = info;
+            return this.triggerSaveProc();
+        }
+        else {
+            throw new Error(`Upload versions don't match`);
+        }
     }
     recordUploadCancellation(info) {
-        (0, assert_1.assert)(!!this.status.local);
-        const local = this.status.local;
-        (0, assert_1.assert)(!!local.upload &&
-            (local.upload.uploadVersion === info.uploadVersion));
-        local.upload = undefined;
+        var _a;
+        if (((_a = this.status.upload) === null || _a === void 0 ? void 0 : _a.type) !== 'new-version') {
+            throw new Error(`No upload in object status`);
+        }
+        if (this.status.upload.uploadVersion === info.uploadVersion) {
+            this.status.upload = undefined;
+            return this.triggerSaveProc();
+        }
+        else {
+            throw new Error(`Upload versions don't match`);
+        }
+    }
+    recordUploadCompletion(localVersion, uploadVersion) {
+        const { local, synced, remote, upload } = this.status;
+        if (((upload === null || upload === void 0 ? void 0 : upload.type) !== 'new-version')
+            || (upload.uploadVersion !== uploadVersion)) {
+            throw new Error(`Upload versions don't match`);
+        }
+        const syncedBase = upload.baseVersion;
+        if (!remote.current || (remote.current <= uploadVersion)) {
+            (0, obj_info_file_1.setCurrentVersionIn)(remote, uploadVersion, syncedBase);
+        }
+        if (synced) {
+            synced.version = uploadVersion;
+            if (synced.base && (synced.base !== syncedBase)) {
+                (0, obj_info_file_1.rmNonArchVersionsIn)(remote, synced.base);
+            }
+            synced.base = syncedBase;
+        }
+        else {
+            this.status.synced = { version: uploadVersion, base: syncedBase };
+        }
+        if (local.current === localVersion) {
+            this.status.local = undefined;
+        }
+        this.status.upload = undefined;
+        this.updateStateIndicator();
         return this.triggerSaveProc();
     }
     async recordArchVersionRemoval(version) {
@@ -256,31 +325,40 @@ class ObjStatus {
         this.updateStateIndicator();
         return this.triggerSaveProc();
     }
-    async recordRemoteChange(version) {
-        const { local, synced, remote } = this.status;
-        if (((local === null || local === void 0 ? void 0 : local.upload) && (local.upload.uploadVersion === version))
-            || ((synced === null || synced === void 0 ? void 0 : synced.version) && (synced.version >= version))) {
+    async recordRemoteRemovalCompletion() {
+        var _a;
+        const { remote, upload, synced } = this.status;
+        if ((_a = this.status.synced) === null || _a === void 0 ? void 0 : _a.isArchived) {
             return;
         }
-        remote.current = version;
+        if ((upload === null || upload === void 0 ? void 0 : upload.type) !== 'removal') {
+            throw new Error(`Upload of removal is not in status`);
+        }
+        (0, obj_info_file_1.rmCurrentVersionIn)(remote);
+        remote.isArchived = true;
+        if (synced) {
+            synced.isArchived = true;
+            synced.version = undefined;
+            synced.base = undefined;
+        }
+        else {
+            this.status.synced = { isArchived: true };
+        }
+        this.status.local = undefined;
+        this.status.upload = undefined;
         this.updateStateIndicator();
         return this.triggerSaveProc();
     }
-    recordSyncOfObjRemoval() {
-        this.status.local = undefined;
-        (0, obj_info_file_1.rmCurrentVersionIn)(this.status.remote);
-        this.status.remote.isArchived = true;
-        if (this.status.synced) {
-            this.status.synced.isArchived = true;
-            this.status.synced.version = undefined;
-            if (this.status.synced.base) {
-                (0, obj_info_file_1.rmNonArchVersionsIn)(this.status.remote, this.status.synced.base);
-                this.status.synced.base = undefined;
-            }
+    async recordRemoteChange(version) {
+        const { synced, remote, upload } = this.status;
+        if (((upload === null || upload === void 0 ? void 0 : upload.type) === 'new-version')
+            && (upload.uploadVersion === version)) {
+            return;
         }
-        else {
-            this.status.synced = { isArchived: true };
+        if ((synced === null || synced === void 0 ? void 0 : synced.version) && (synced.version >= version)) {
+            return;
         }
+        remote.current = version;
         this.updateStateIndicator();
         return this.triggerSaveProc();
     }
@@ -346,33 +424,6 @@ class ObjStatus {
             return { localBases };
         }
     }
-    markLocalVersionSynced(localVersion, uploadVersion) {
-        const { local, synced, remote } = this.status;
-        (0, assert_1.assert)(!!(local === null || local === void 0 ? void 0 : local.upload) &&
-            ((local === null || local === void 0 ? void 0 : local.upload.uploadVersion) === uploadVersion));
-        const syncedBase = local.upload.baseVersion;
-        if (!remote.current || (remote.current <= uploadVersion)) {
-            (0, obj_info_file_1.setCurrentVersionIn)(remote, uploadVersion, syncedBase);
-        }
-        if (synced) {
-            synced.version = uploadVersion;
-            if (synced.base && (synced.base !== syncedBase)) {
-                (0, obj_info_file_1.rmNonArchVersionsIn)(remote, synced.base);
-            }
-            synced.base = syncedBase;
-        }
-        else {
-            this.status.synced = { version: uploadVersion, base: syncedBase };
-        }
-        if (local.current === localVersion) {
-            this.status.local = undefined;
-        }
-        else {
-            local.upload = undefined;
-        }
-        this.updateStateIndicator();
-        return this.triggerSaveProc();
-    }
     async setLocalCurrentVersion(version, baseVer) {
         if (!this.status.local) {
             this.status.local = makeVersions();
@@ -446,6 +497,15 @@ class ObjStatus {
         const synced = this.status.synced;
         return (!(synced === null || synced === void 0 ? void 0 : synced.version) && !(synced === null || synced === void 0 ? void 0 : synced.isArchived));
     }
+    versionBeforeUnsyncedRemoval() {
+        var _a;
+        if ((this.stateIndicator !== 'synced')
+            && ((_a = this.status.local) === null || _a === void 0 ? void 0 : _a.isArchived)
+            && this.status.upload
+            && (this.status.upload.type === 'removal')) {
+            return this.status.upload.localVersion;
+        }
+    }
     async adoptRemoteVersion(version, dropLocalVer = false) {
         var _a;
         const { local, remote } = this.status;
@@ -596,4 +656,9 @@ function addArchVersionsFromList(remote, existingVersions) {
     }
     return isAnythingChanged;
 }
+function skipNotFoundExc(exc) {
+    if (!exc.notFound) {
+        throw exc;
+    }
+}
 Object.freeze(exports);

package/build/core/storage/synced/storage.d.ts

@@ -15,7 +15,7 @@ export declare class SyncedStore implements ISyncedStorage {
     private readonly remoteStorage;
     private readonly getStorages;
     readonly cryptor: AsyncSBoxCryptor;
-    private readonly logError;
+    readonly logError: LogError;
     readonly type: web3n.files.FSType;
     readonly versioned = true;
     readonly nodes: NodesContainer;
@@ -27,12 +27,17 @@ export declare class SyncedStore implements ISyncedStorage {
         syncedStore: ISyncedStorage;
         startObjProcs: () => void;
     }>;
+    static makeAndStartWithoutRemote(path: string, user: string, getStorages: StorageGetter, cryptor: AsyncSBoxCryptor, remoteServiceUrl: () => Promise<string>, net: NetClient, logError: LogError): Promise<{
+        syncedStore: ISyncedStorage;
+        setupRemoteAndStartObjProcs: (getSigner: IGetMailerIdSigner) => void;
+    }>;
     getNodeEvents(): Observable<NodeEvent>;
     broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, childObjId: ObjId | undefined, event: FolderEvent | FileEvent): void;
     storageForLinking(type: web3n.files.FSType, location?: string): IStorage;
     status(objId: ObjId): Promise<SyncedObjStatus>;
     adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
     updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
+    isObjOnDisk(objId: ObjId): Promise<boolean>;
     isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'complete' | 'partial' | 'none'>;
     download(objId: ObjId, version: number): Promise<void>;
     upload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean): Promise<void>;
@@ -43,7 +48,7 @@ export declare class SyncedStore implements ISyncedStorage {
     generateNewObjId(): Promise<string>;
     private objFromDiskOrDownload;
     private getObjOrThrow;
-    getObjSrc(objId: ObjId, version?: number): Promise<ObjSource>;
+    getObjSrc(objId: ObjId, version?: number, allowArchived?: boolean): Promise<ObjSource>;
     getObjSrcOfRemoteVersion(objId: ObjId, version: number): Promise<ObjSource>;
     saveObj(objId: ObjId, version: number, encSub: Subscribe): Promise<void>;
     removeObj(objId: string): Promise<void>;

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

@@ -43,10 +43,12 @@ class SyncedStore {
         Object.seal(this);
     }
     static async makeAndStart(path, user, getSigner, getStorages, cryptor, remoteServiceUrl, net, logError) {
-        const remote = new service_1.StorageOwner(user, getSigner, remoteServiceUrl, net);
+        const remote = service_1.StorageOwner.make(user, getSigner, remoteServiceUrl, net);
         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: () => {
@@ -54,6 +56,21 @@ class SyncedStore {
             }
         };
     }
+    static async makeAndStartWithoutRemote(path, user, getStorages, cryptor, remoteServiceUrl, net, logError) {
+        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 => {
+                setMid(getSigner);
+                s.uploader.start();
+                s.remoteEvents.startAbsorbingRemoteEvents();
+            }
+        };
+    }
     getNodeEvents() {
         return this.events.event$;
     }
@@ -72,7 +89,7 @@ class SyncedStore {
         }
     }
     async status(objId) {
-        const obj = await this.getObjOrThrow(objId);
+        const obj = await this.getObjOrThrow(objId, true);
         return obj.syncStatus();
     }
     async adoptRemote(objId, opts) {
@@ -81,6 +98,7 @@ class SyncedStore {
         await objStatus.adoptRemoteVersion(opts === null || opts === void 0 ? void 0 : opts.remoteVersion, opts === null || opts === void 0 ? void 0 : opts.dropLocalVer);
         if (opts && opts.download) {
             // XXX this needs implementation
+            throw new Error('SyncedStore.adoptRemote() with download option needs implementation, probably using SyncedStore.download().');
         }
         this.files.scheduleGC(obj);
         return objStatus.syncStatus().synced.latest;
@@ -103,16 +121,29 @@ class SyncedStore {
             throw exc;
         }
     }
-    isRemoteVersionOnDisk(objId, version) {
+    async isObjOnDisk(objId) {
+        const obj = await this.files.findObj(objId);
+        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
-        //  - check that given version is synced
         //  - get state of file
-        // But, should this be renamed to isRemoteVersionOnDisk ?
-        // 
         throw new Error('SyncedStore.isRemoteVersionOnDisk() not implemented.');
     }
     download(objId, version) {
-        // XXX 
+        // 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 upload(objId, localVersion, uploadVersion, uploadHeader, createOnRemote) {
@@ -134,7 +165,14 @@ class SyncedStore {
         if (!objId) {
             return;
         }
-        await this.remoteStorage.deleteObj(objId);
+        const obj = await this.getObjOrThrow(objId, true);
+        const status = obj.statusObj();
+        if (status.neverUploaded()) {
+            return;
+        }
+        if (await status.clearPostponeFlagInRemovalOnRemote()) {
+            await this.uploader.removeCurrentVersionOf(obj);
+        }
     }
     dropCachedLocalObjVersionsLessOrEqual(objId, version) {
         const obj = this.files.getObjInCache(objId);
@@ -164,6 +202,8 @@ class SyncedStore {
         if (obj) {
             return obj;
         }
+        // XXX
+        //  - can we create object by getting obj status
         return await this.files.makeByDownloadingCurrentVersion(objId);
     }
     async getObjOrThrow(objId, allowArchived = false) {
@@ -175,8 +215,8 @@ class SyncedStore {
             return obj;
         }
     }
-    async getObjSrc(objId, version) {
-        const obj = await this.getObjOrThrow(objId);
+    async getObjSrc(objId, version, allowArchived = false) {
+        const obj = await this.getObjOrThrow(objId, allowArchived);
         if (!version) {
             version = obj.statusObj().getCurrentLocalOrSynced();
         }

package/build/core/storage/synced/upsyncer.d.ts

@@ -3,7 +3,7 @@ import { SyncedObj } from "./obj-files";
 import { MonoTypeOperatorFunction } from "rxjs";
 import { FileWrite } from "../../../lib-client/objs-on-disk/file-writing-proc";
 import { LogError } from "../../../lib-client/logging/log-to-file";
-import { UploadInfo } from "./obj-status";
+import { NewVersionUpload } from "./obj-status";
 export declare type FileWriteTapOperator = MonoTypeOperatorFunction<FileWrite[]>;
 export declare class UpSyncer {
     private readonly remoteStorage;
@@ -21,7 +21,7 @@ export declare class UpSyncer {
     uploadFromDisk(obj: SyncedObj, localVersion: number, uploadVersion: number, uploadHeader: Uint8Array | undefined, syncedBase: number | undefined, createOnRemote: boolean): Promise<void>;
 }
 export interface UploadStatusRecorder {
-    recordUploadStart(info: UploadInfo): Promise<void>;
-    recordUploadCancellation(info: UploadInfo): Promise<void>;
-    recordUploadInterimState(info: UploadInfo): Promise<void>;
+    recordUploadStart(info: NewVersionUpload): Promise<void>;
+    recordUploadCancellation(info: NewVersionUpload): Promise<void>;
+    recordUploadInterimState(info: NewVersionUpload): Promise<void>;
 }

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

@@ -50,12 +50,17 @@ class UpSyncer {
         // return objUploads.tapFileWrite(isNew, newVersion, baseVersion);
     }
     async removeCurrentVersionOf(obj) {
-        throw new Error('UpSyncer.removeCurrentVersionOf() not implemented');
-        // const objUploads = this.getOrMakeUploadsFor(obj);
-        // XXX is removal set in this older code? This may need to change anyway
-        // if (objUploads.neededExecutor()) {
-        // 	this.execPools.add(objUploads);
-        // }
+        try {
+            await this.remoteStorage.deleteObj(obj.objId);
+        }
+        catch (exc) {
+            // XXX
+            //  - we need to distinguish errors and put this work somewhere
+            //    to run when we go online, for example.
+            await this.logError(exc, `Uploading of obj removal failed.`);
+            return;
+        }
+        await obj.recordRemovalUploadAndGC();
     }
     async uploadFromDisk(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createOnRemote) {
         const task = await UploadTask.for(obj, localVersion, uploadVersion, uploadHeader, syncedBase, createOnRemote, this.remoteStorage, this.execPools);
@@ -90,6 +95,7 @@ class UploadTask {
             needUpload = await wholeVerUpload(src, uploadHeader, createObj);
         }
         const info = {
+            type: 'new-version',
             localVersion,
             uploadVersion,
             baseVersion: syncedBase,

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;
     /**