core-3nweb-client-lib 0.26.1 → 0.27.0

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

@@ -27,6 +27,7 @@ const service_locator_1 = require("../service-locator");
 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");
 class StorageOwner extends user_with_mid_session_1.ServiceUser {
     constructor(user, getSigner, mainUrlGetter, net) {
         super(user, {
@@ -35,7 +36,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             canBeRedirected: true
         }, getSigner, async () => {
             const serviceUrl = await mainUrlGetter();
-            const info = await service_locator_1.storageInfoAt(this.net, serviceUrl);
+            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}`);
             }
@@ -51,11 +52,11 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             responseType: 'json'
         });
         if (rep.status !== api.sessionParams.SC.ok) {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
         const keyDerivParams = rep.data;
         if (!keyGen.checkParams(rep.data)) {
-            throw request_utils_1.makeException(rep, 'Malformed response');
+            throw (0, request_utils_1.makeException)(rep, 'Malformed response');
         }
         return keyDerivParams;
     }
@@ -66,11 +67,11 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             responseType: 'json'
         });
         if (rep.status !== api.sessionParams.SC.ok) {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
         if ((typeof rep.data.maxChunkSize !== 'number') ||
             (rep.data.maxChunkSize < 64 * 1024)) {
-            throw request_utils_1.makeException(rep, 'Malformed response');
+            throw (0, request_utils_1.makeException)(rep, 'Malformed response');
         }
         this.maxChunkSize = rep.data.maxChunkSize;
     }
@@ -98,10 +99,10 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return;
         }
         else if (rep.status === api.cancelTransaction.SC.missing) {
-            throw exceptions_1.makeUnknownTransactionExc(objId);
+            throw (0, exceptions_1.makeUnknownTransactionExc)(objId);
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
     /**
@@ -128,13 +129,13 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
         });
         if (rep.status === api.currentObj.SC.okGet) {
             if (!(rep.data instanceof Uint8Array)) {
-                throw request_utils_1.makeException(rep, `Malformed response: body is not binary`);
+                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is not binary`);
             }
-            const version = request_utils_1.extractIntHeader(rep, api.HTTP_HEADER.objVersion);
-            const segsTotalLen = request_utils_1.extractIntHeader(rep, api.HTTP_HEADER.objSegmentsLength);
-            const headerLen = request_utils_1.extractIntHeader(rep, api.HTTP_HEADER.objHeaderLength);
+            const version = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objVersion);
+            const segsTotalLen = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objSegmentsLength);
+            const headerLen = (0, request_utils_1.extractIntHeader)(rep, api.HTTP_HEADER.objHeaderLength);
             if (rep.data.length > (headerLen + segsTotalLen)) {
-                throw request_utils_1.makeException(rep, `Malformed response: body is too long`);
+                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is too long`);
             }
             return {
                 version, segsTotalLen,
@@ -143,10 +144,10 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             };
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
     /**
@@ -173,15 +174,15 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
         });
         if (rep.status === api.currentObj.SC.okGet) {
             if (!(rep.data instanceof Uint8Array)) {
-                throw request_utils_1.makeException(rep, `Malformed response: body is not binary`);
+                throw (0, request_utils_1.makeException)(rep, `Malformed response: body is not binary`);
             }
             return rep.data;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
     /**
@@ -190,50 +191,117 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
      * complete, or to a transaction id, which must be used for subsequent
      * request(s).
      * @param objId is object's id, with null value for root object
-     * @param bytes are bytes to upload
      * @param fstReq is options object for the first request
      * @param followReq is options object for subsequent request(s)
+     * @param bytes is an object with header, diff and segs bytes to upload
      */
-    async saveNewObjVersion(objId, bytes, fstReq, followReq) {
+    async saveNewObjVersion(objId, fstReq, followReq, { header, diff, segs }) {
         let appPath;
         if (fstReq) {
+            (0, assert_1.assert)(!!header);
+            const { create, ver, last } = fstReq;
+            const reqOpts = {
+                create, ver, last,
+                header: header.length,
+                diff: (diff ? diff.length : undefined)
+            };
             appPath = (objId ?
-                api.currentObj.firstPutReqUrlEnd(objId, fstReq) :
-                api.currentRootObj.firstPutReqUrlEnd(fstReq));
+                api.currentObj.firstPutReqUrlEnd(objId, reqOpts) :
+                api.currentRootObj.firstPutReqUrlEnd(reqOpts));
         }
         else if (followReq) {
+            const { ofs, trans, last } = followReq;
+            // XXX segs argument will introduce difference between these two
+            const reqOpts = {
+                ofs, trans, last
+            };
             appPath = (objId ?
-                api.currentObj.secondPutReqUrlEnd(objId, followReq) :
-                api.currentRootObj.secondPutReqUrlEnd(followReq));
+                api.currentObj.secondPutReqUrlEnd(objId, reqOpts) :
+                api.currentRootObj.secondPutReqUrlEnd(reqOpts));
         }
         else {
             throw new Error(`Missing request options`);
         }
+        // ordering body bytes in accordance with protocol expectation
+        const bytes = [];
+        if (diff) {
+            bytes.push(diff);
+        }
+        if (header) {
+            bytes.push(header);
+        }
+        if (segs) {
+            if (Array.isArray(segs)) {
+                bytes.push(...segs);
+            }
+            else {
+                bytes.push(segs);
+            }
+        }
         const rep = await this.doBinarySessionRequest({ appPath, method: 'PUT', responseType: 'json' }, bytes);
         if (rep.status === api.currentObj.SC.okPut) {
             return rep.data.transactionId;
         }
         else if (rep.status === api.currentObj.SC.objAlreadyExists) {
-            throw exceptions_1.makeObjExistsExc(objId, undefined, true);
+            throw (0, exceptions_1.makeObjExistsExc)(objId, undefined, true);
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
         }
         else if (rep.status === api.currentObj.SC.concurrentTransaction) {
-            throw exceptions_1.makeConcurrentTransExc(objId);
+            throw (0, exceptions_1.makeConcurrentTransExc)(objId);
         }
         else if (rep.status === api.currentObj.SC.unknownTransaction) {
-            throw exceptions_1.makeUnknownTransactionExc(objId);
+            throw (0, exceptions_1.makeUnknownTransactionExc)(objId);
         }
         else if (rep.status === api.currentObj.SC.mismatchedObjVer) {
             const curVer = rep.current_version;
             if (!Number.isInteger(curVer)) {
                 throw new Error(`Got non-integer current object version value from a version mismatch reply ${curVer}`);
             }
-            throw exceptions_1.makeVersionMismatchExc(objId, curVer);
+            throw (0, exceptions_1.makeVersionMismatchExc)(objId, curVer);
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        }
+    }
+    async archiveObjVersion(objId, currentVer) {
+        const rep = await this.doBodylessSessionRequest({
+            appPath: (objId ?
+                api.archiveObj.postAndDelReqUrlEnd(objId, currentVer) :
+                api.archiveRoot.postAndDelReqUrlEnd(currentVer)),
+            method: 'POST'
+        });
+        if (rep.status === api.archiveObj.SC.okPost) {
+            return;
+        }
+        else if (rep.status === api.currentObj.SC.unknownObj) {
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+        }
+        else if (rep.status === api.currentObj.SC.unknownObjVer) {
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, currentVer, true);
+        }
+        else {
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+        }
+    }
+    async getObjStatus(objId) {
+        const rep = await this.doBodylessSessionRequest({
+            appPath: (objId ?
+                api.objStatus.getReqUrlEnd(objId) :
+                api.rootStatus.getReqUrlEnd()),
+            method: 'GET',
+            responseType: 'json'
+        });
+        if (rep.status === api.objStatus.SC.ok) {
+            // XXX we may want to add sanity check(s)
+            return rep.data;
+        }
+        else if (rep.status === api.objStatus.SC.unknownObj) {
+            throw (0, exceptions_1.makeObjNotFoundExc)(objId, undefined, true);
+        }
+        else {
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
     /**
@@ -245,29 +313,27 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
      */
     async deleteObj(objId) {
         const rep = await this.doBodylessSessionRequest({
-            appPath: api.currentObj.getReqUrlEnd(objId),
+            appPath: api.currentObj.delReqUrlEnd(objId),
             method: 'DELETE'
         });
-        if (rep.status === api.currentObj.SC.okDelete) {
+        if ((rep.status === api.currentObj.SC.okDelete)
+            || (rep.status === api.currentObj.SC.unknownObj)) {
             return;
         }
         else if (rep.status === api.currentObj.SC.concurrentTransaction) {
-            throw exceptions_1.makeConcurrentTransExc(objId);
-        }
-        else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
+            throw (0, exceptions_1.makeConcurrentTransExc)(objId);
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
     async openEventSource() {
         const rep = await this.openWS(api.wsEventChannel.URL_END);
         if (rep.status === api.wsEventChannel.SC.ok) {
-            return ws_ipc_1.makeSubscriber(rep.data, undefined);
+            return (0, ws_ipc_1.makeSubscriber)(rep.data, undefined);
         }
         else {
-            throw request_utils_1.makeException(rep, 'Unexpected status');
+            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
 }

package/build/lib-client/3nstorage/util/file-based-json.d.ts

@@ -1,10 +1,11 @@
 declare type WritableFile = web3n.files.WritableFile;
 declare type FileEvent = web3n.files.FileEvent;
+declare type RemoteEvent = web3n.files.RemoteEvent;
 export declare abstract class JsonFileProc<T> {
     private proc;
     private file;
     start(file: WritableFile, initVal: T | (() => T) | (() => Promise<T>)): Promise<void>;
-    protected abstract onFileEvent(ev: FileEvent): Promise<void>;
+    protected abstract onFileEvent(ev: FileEvent | RemoteEvent): Promise<void>;
     close(): Promise<void>;
     private ensureActive;
     /**

package/build/lib-client/3nstorage/util/file-based-json.js

@@ -38,7 +38,7 @@ class JsonFileProc {
             await this.file.writeJSON(fstVal);
         }
         this.proc = (new rxjs_1.Observable(obs => this.file.watch(obs)))
-            .pipe(operators_1.mergeMap(ev => this.onFileEvent(ev), 1))
+            .pipe((0, operators_1.mergeMap)(ev => this.onFileEvent(ev), 1))
             .subscribe();
     }
     async close() {

package/build/lib-client/3nstorage/xsp-fs/attrs.js

@@ -37,14 +37,14 @@ class CommonAttrs {
         if (bytes.length < CommonAttrs.PACK_LEN) {
             throw parsingException(`byte array is too short`);
         }
-        const ctime = big_endian_1.uintFrom6Bytes(bytes, 0);
-        const mtime = big_endian_1.uintFrom6Bytes(bytes, 6);
+        const ctime = (0, big_endian_1.uintFrom6Bytes)(bytes, 0);
+        const mtime = (0, big_endian_1.uintFrom6Bytes)(bytes, 6);
         return new CommonAttrs(ctime, mtime);
     }
     pack() {
         const bytes = Buffer.allocUnsafe(CommonAttrs.PACK_LEN);
-        big_endian_1.packUintTo6Bytes(this.ctime, bytes, 0);
-        big_endian_1.packUintTo6Bytes(this.mtime, bytes, 6);
+        (0, big_endian_1.packUintTo6Bytes)(this.ctime, bytes, 0);
+        (0, big_endian_1.packUintTo6Bytes)(this.mtime, bytes, 6);
         return bytes;
     }
     copy() {
@@ -71,7 +71,7 @@ class XAttrs {
         for (const bytes of sections) {
             let i = 0;
             while (i < bytes.length) {
-                const { bytesRead, binVal, strVal, jsonVal, xaName } = extAttrs.readNamedAttr(buffer_utils_1.toBuffer(bytes), i);
+                const { bytesRead, binVal, strVal, jsonVal, xaName } = extAttrs.readNamedAttr((0, buffer_utils_1.toBuffer)(bytes), i);
                 xattrs.attrs.set(xaName, { binVal, strVal, jsonVal });
                 i += bytesRead;
             }
@@ -141,7 +141,7 @@ class XAttrs {
                 bytes.push(extAttrs.packNamedBinaryAttr(xaName, v.binVal));
             }
             else {
-                assert_1.assert(v.jsonVal !== undefined);
+                (0, assert_1.assert)(v.jsonVal !== undefined);
                 bytes.push(extAttrs.packNamedJsonAttr(xaName, v.jsonVal));
             }
         }
@@ -179,7 +179,7 @@ var extAttrs;
             else if (t.type === NAMED_JSON) {
                 return {
                     bytesRead, xaName,
-                    jsonVal: JSON.parse(buffer_utils_1.toBuffer(bytes).slice(ofs, ofs + contentLen).toString('utf8')),
+                    jsonVal: JSON.parse((0, buffer_utils_1.toBuffer)(bytes).slice(ofs, ofs + contentLen).toString('utf8')),
                 };
             }
             else if (t.type === NAMED_BINARY) {
@@ -208,17 +208,17 @@ var extAttrs;
             case 1:
                 return bytes[i];
             case 2:
-                return big_endian_1.uintFrom2Bytes(bytes, i);
+                return (0, big_endian_1.uintFrom2Bytes)(bytes, i);
             case 3:
-                return big_endian_1.uintFrom3Bytes(bytes, i);
+                return (0, big_endian_1.uintFrom3Bytes)(bytes, i);
             case 4:
-                return big_endian_1.uintFrom4Bytes(bytes, i);
+                return (0, big_endian_1.uintFrom4Bytes)(bytes, i);
             default:
                 throw parsingException(`Too many bytes for xattr length`);
         }
     }
     function packNamedStrAttr(name, value) {
-        assert_1.assert((typeof name === 'string') && (name.length > 0) &&
+        (0, assert_1.assert)((typeof name === 'string') && (name.length > 0) &&
             (typeof value === 'string') && (value.length > 0));
         const nameBin = Buffer.from(name, 'utf8');
         const valueBin = Buffer.from(value, 'utf8');
@@ -226,14 +226,14 @@ var extAttrs;
     }
     extAttrs.packNamedStrAttr = packNamedStrAttr;
     function packNamedBinaryAttr(name, value) {
-        assert_1.assert((typeof name === 'string') && (name.length > 0) &&
+        (0, assert_1.assert)((typeof name === 'string') && (name.length > 0) &&
             (value.length > 0));
         const nameBin = Buffer.from(name, 'utf8');
         return packNamedAttr(NAMED_BINARY, nameBin, value);
     }
     extAttrs.packNamedBinaryAttr = packNamedBinaryAttr;
     function packNamedJsonAttr(name, value) {
-        assert_1.assert((typeof name === 'string') && (name.length > 0) &&
+        (0, assert_1.assert)((typeof name === 'string') && (name.length > 0) &&
             (value !== undefined));
         const nameBin = Buffer.from(name, 'utf8');
         const valueBin = Buffer.from(JSON.stringify(value), 'utf8');
@@ -292,16 +292,16 @@ var extAttrs;
                 b[i] = u;
                 break;
             case 2:
-                big_endian_1.packUintTo2Bytes(u, b, i);
+                (0, big_endian_1.packUintTo2Bytes)(u, b, i);
                 break;
             case 3:
-                big_endian_1.packUintTo3Bytes(u, b, i);
+                (0, big_endian_1.packUintTo3Bytes)(u, b, i);
                 break;
             case 4:
-                big_endian_1.packUintTo4Bytes(u, b, i);
+                (0, big_endian_1.packUintTo4Bytes)(u, b, i);
                 break;
             default:
-                assert_1.assert(false);
+                (0, assert_1.assert)(false);
         }
     }
     // export function pack(xattrs: XAttrs): Buffer {

package/build/lib-client/3nstorage/xsp-fs/common.d.ts

@@ -1,28 +1,22 @@
 import { ScryptGenParams } from '../../key-derivation';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
-import { objChanged, objRemoved } from '../../../lib-common/service-api/3nstorage/owner';
 import { Observable } from 'rxjs';
-import { UpSyncTaskInfo } from '../../../core/storage/synced/obj-status';
 export { AsyncSBoxCryptor } from 'xsp-files';
 export { FolderInJSON } from './folder-node';
 declare type StorageType = web3n.files.FSType;
 declare type FolderEvent = web3n.files.FolderEvent;
 declare type FileEvent = web3n.files.FileEvent;
-declare type Stats = web3n.files.Stats;
-export interface RemoteObjRemovalEvent extends objRemoved.Event {
-    type: 'remote-delete';
-}
-export interface RemoteObjChangeEvent extends objChanged.Event {
-    type: 'remote-change';
-}
-export declare type RemoteEvent = RemoteObjRemovalEvent | RemoteObjChangeEvent;
+declare type RemoteEvent = web3n.files.RemoteEvent;
+declare type SyncStatus = web3n.files.SyncStatus;
+declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
+declare type FSSyncException = web3n.files.FSSyncException;
+declare type FileException = web3n.files.FileException;
+export declare type FSChangeSrc = web3n.files.FSChangeEvent['src'];
 export interface Node {
     objId: string;
     name: string;
     type: NodeType;
-    processRemoteEvent: (event: RemoteEvent) => Promise<void>;
-    broadcastUpSyncEvent(task: UpSyncTaskInfo): void;
-    localDelete(): Promise<void>;
+    removeObj(src?: FSChangeSrc): Promise<void>;
 }
 export declare type NodeType = 'file' | 'link' | 'folder';
 export declare type ObjId = string | null;
@@ -56,7 +50,8 @@ export declare class NodesContainer {
 export interface NodeEvent {
     objId: ObjId;
     parentObjId?: ObjId;
-    event: FolderEvent | FileEvent;
+    childObjId?: ObjId;
+    event: FolderEvent | FileEvent | RemoteEvent;
 }
 export interface Storage {
     readonly type: StorageType;
@@ -64,7 +59,7 @@ export interface Storage {
     readonly cryptor: AsyncSBoxCryptor;
     readonly nodes: NodesContainer;
     getNodeEvents(): Observable<NodeEvent>;
-    broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, ev: FolderEvent | FileEvent): void;
+    broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, childObjId: ObjId | undefined, ev: NodeEvent['event']): void;
     /**
      * This returns a storage of another type, for use by link functionality.
      * @param type is a type of a requested storage.
@@ -79,8 +74,9 @@ export interface Storage {
     /**
      * This returns a promise, resolvable to source for a requested object.
      * @param objId
+     * @param version
      */
-    getObj(objId: ObjId): Promise<ObjSource>;
+    getObjSrc(objId: ObjId, version?: number): Promise<ObjSource>;
     /**
      * This saves given object, asynchronously.
      * @param objId
@@ -98,15 +94,43 @@ export interface Storage {
      * This asynchronously runs closing cleanup.
      */
     close(): Promise<void>;
+    status(objId: ObjId): Promise<LocalObjStatus>;
+}
+export interface LocalObjStatus {
+    archiveCurrentVersion(): Promise<void>;
+    listVersions(): {
+        current?: number;
+        archived?: number[];
+    };
 }
 export declare function wrapStorageImplementation(impl: Storage): Storage;
 export declare type StorageGetter = (type: StorageType, location?: string) => Storage;
 export interface SyncedStorage extends Storage {
+    getObjSrcOfRemoteVersion(objId: ObjId, version: number): Promise<ObjSource>;
+    archiveVersionOnServer(objId: ObjId, version: number): Promise<void>;
     /**
      * This returns a promise, resolvable to root key generation parameters.
      */
     getRootKeyDerivParamsFromServer(): Promise<ScryptGenParams>;
-    getRemoteConflictObjVersion(objId: ObjId, version: number): Promise<ObjSource>;
-    getObjSyncInfo(objId: ObjId): Promise<Stats['sync']>;
+    adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
+    updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
+    isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'partial' | 'complete' | 'none'>;
+    download(objId: ObjId, version: number): Promise<void>;
+    upload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean): Promise<void>;
+    dropCachedLocalObjVersionsLessOrEqual(objId: ObjId, localVersion: number): void;
+    uploadObjRemoval(objId: ObjId): Promise<void>;
+    status(objId: ObjId): Promise<SyncedObjStatus>;
+}
+export interface SyncedObjStatus extends LocalObjStatus {
+    syncStatus(): SyncStatus;
+    neverUploaded(): boolean;
+}
+export interface UploadHeaderChange {
+    localVersion: number;
+    uploadVersion: number;
+    localHeader: Uint8Array;
+    uploadHeader: Uint8Array;
 }
 export declare function wrapSyncStorageImplementation(impl: SyncedStorage): SyncedStorage;
+export declare function isSyncedStorage(storage: Storage): boolean;
+export declare function setPathInExc(exc: FSSyncException | FileException, path: string): FSSyncException | FileException;

package/build/lib-client/3nstorage/xsp-fs/common.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapSyncStorageImplementation = exports.wrapStorageImplementation = exports.NodesContainer = void 0;
+exports.setPathInExc = exports.isSyncedStorage = exports.wrapSyncStorageImplementation = exports.wrapStorageImplementation = exports.NodesContainer = void 0;
 /**
  * This is a container for file system nodes.
  *
@@ -102,10 +102,11 @@ function wrapStorageImplementation(impl) {
         broadcastNodeEvent: impl.broadcastNodeEvent.bind(impl),
         storageForLinking: impl.storageForLinking.bind(impl),
         generateNewObjId: impl.generateNewObjId.bind(impl),
-        getObj: impl.getObj.bind(impl),
+        getObjSrc: impl.getObjSrc.bind(impl),
         saveObj: impl.saveObj.bind(impl),
         close: impl.close.bind(impl),
         removeObj: impl.removeObj.bind(impl),
+        status: impl.status.bind(impl),
         cryptor: impl.cryptor
     };
     return Object.freeze(wrap);
@@ -113,24 +114,33 @@ function wrapStorageImplementation(impl) {
 exports.wrapStorageImplementation = wrapStorageImplementation;
 function wrapSyncStorageImplementation(impl) {
     const storageWrap = wrapStorageImplementation(impl);
-    const wrap = {
-        type: storageWrap.type,
-        versioned: storageWrap.versioned,
-        close: storageWrap.close,
-        cryptor: storageWrap.cryptor,
-        generateNewObjId: storageWrap.generateNewObjId,
-        getObj: storageWrap.getObj,
-        nodes: storageWrap.nodes,
-        getNodeEvents: storageWrap.getNodeEvents,
-        broadcastNodeEvent: storageWrap.broadcastNodeEvent,
-        removeObj: storageWrap.removeObj,
-        saveObj: storageWrap.saveObj,
-        storageForLinking: storageWrap.storageForLinking,
-        getRootKeyDerivParamsFromServer: impl.getRootKeyDerivParamsFromServer.bind(impl),
-        getRemoteConflictObjVersion: impl.getRemoteConflictObjVersion.bind(impl),
-        getObjSyncInfo: impl.getObjSyncInfo.bind(impl)
-    };
+    const wrap = {};
+    for (const [field, value] of Object.entries(storageWrap)) {
+        wrap[field] = value;
+    }
+    wrap.getRootKeyDerivParamsFromServer =
+        impl.getRootKeyDerivParamsFromServer.bind(impl);
+    wrap.getObjSrcOfRemoteVersion = impl.getObjSrcOfRemoteVersion.bind(impl);
+    wrap.archiveVersionOnServer = impl.archiveVersionOnServer.bind(impl);
+    wrap.isRemoteVersionOnDisk = impl.isRemoteVersionOnDisk.bind(impl);
+    wrap.download = impl.download.bind(impl);
+    wrap.upload = impl.upload.bind(impl);
+    wrap.uploadObjRemoval = impl.uploadObjRemoval.bind(impl);
+    wrap.dropCachedLocalObjVersionsLessOrEqual = impl.dropCachedLocalObjVersionsLessOrEqual.bind(impl);
+    wrap.adoptRemote = impl.adoptRemote.bind(impl);
+    wrap.updateStatusInfo = impl.updateStatusInfo.bind(impl);
     return Object.freeze(wrap);
 }
 exports.wrapSyncStorageImplementation = wrapSyncStorageImplementation;
+function isSyncedStorage(storage) {
+    return !!storage.upload;
+}
+exports.isSyncedStorage = isSyncedStorage;
+function setPathInExc(exc, path) {
+    if ((exc.type === 'fs-sync') || (exc.type === 'file')) {
+        exc.path = path;
+    }
+    return exc;
+}
+exports.setPathInExc = setPathInExc;
 Object.freeze(exports);

package/build/lib-client/3nstorage/xsp-fs/file-node.d.ts

@@ -45,6 +45,7 @@ export declare class FileNode extends NodeInFS<FilePersistance> {
     static makeForExisting(storage: Storage, parentId: string, fileName: string, objId: string, key: Uint8Array): Promise<FileNode>;
     static makeFromLinkParams(storage: Storage, params: FileLinkParams): Promise<FileNode>;
     private static initWithAttrs;
+    protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     private setUpdatedState;
     get size(): number;
     readSrc(): Promise<{