core-3nweb-client-lib 0.27.3 → 0.27.5

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

@@ -46,7 +46,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) {
@@ -72,7 +72,7 @@ var login;
     }
     login.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('login');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'login');
         return async (serviceUrl) => {
             const req = requestType.pack({ serviceUrl });
             const buf = await caller.startPromiseCall(path, req);

package/build/ipc-via-protobuf/protobuf-msg.d.ts

@@ -45,4 +45,5 @@ export declare function toOptAny(value: any | undefined): AnyValue | undefined;
 export declare function valOfOptAny(valObj: AnyValue | undefined): any | undefined;
 export declare function encodeToUtf8(str: string): Uint8Array;
 export declare function decodeFromUtf8(bytes: Uint8Array): string;
+export declare function methodPathFor<T>(objPath: string[], method: keyof T): string[];
 export {};

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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeFromUtf8 = exports.encodeToUtf8 = exports.valOfOptAny = exports.toOptAny = exports.toOptJson = exports.valOfOptJson = exports.valOfOpt = exports.intValOf = exports.valOf = exports.toOptVal = exports.toVal = exports.errFromMsg = exports.errToMsg = exports.errBodyType = exports.unpackInt = exports.packInt = exports.valOfOptInt = exports.fixInt = exports.fixArray = exports.strArrValType = exports.boolValType = exports.objRefType = void 0;
+exports.methodPathFor = exports.decodeFromUtf8 = exports.encodeToUtf8 = exports.valOfOptAny = exports.toOptAny = exports.toOptJson = exports.valOfOptJson = exports.valOfOpt = exports.intValOf = exports.valOf = exports.toOptVal = exports.toVal = exports.errFromMsg = exports.errToMsg = exports.errBodyType = exports.unpackInt = exports.packInt = exports.valOfOptInt = exports.fixInt = exports.fixArray = exports.strArrValType = exports.boolValType = exports.objRefType = void 0;
 const connector_1 = require("./connector");
 const error_1 = require("../lib-common/exceptions/error");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
@@ -166,4 +166,8 @@ function decodeFromUtf8(bytes) {
     return dec.decode(bytes);
 }
 exports.decodeFromUtf8 = decodeFromUtf8;
+function methodPathFor(objPath, method) {
+    return objPath.concat(method);
+}
+exports.methodPathFor = methodPathFor;
 Object.freeze(exports);

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

@@ -72,7 +72,7 @@ var getAvailableAddresses;
     }
     getAvailableAddresses.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getAvailableAddresses');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getAvailableAddresses');
         return (name, token) => caller
             .startPromiseCall(path, requestType.pack({ name, token: (0, protobuf_msg_1.toOptVal)(token) }))
             .then(buf => (0, protobuf_msg_1.fixArray)(protobuf_msg_1.strArrValType.unpack(buf).values));
@@ -93,7 +93,7 @@ var addUser;
     }
     addUser.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('addUser');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'addUser');
         return (userId, token) => caller
             .startPromiseCall(path, requestType.pack({ userId, token: (0, protobuf_msg_1.toOptVal)(token) }))
             .then(buf => protobuf_msg_1.boolValType.unpack(buf).value);
@@ -114,7 +114,7 @@ var isActivated;
     }
     isActivated_1.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('isActivated');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'isActivated');
         return userId => caller
             .startPromiseCall(path, requestType.pack({ userId }))
             .then(buf => protobuf_msg_1.boolValType.unpack(buf).value);
@@ -137,7 +137,7 @@ var createUserParams;
     }
     createUserParams.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('createUserParams');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'createUserParams');
         return (pass, progressCB) => {
             const s = new rxjs_1.Subject();
             const completion = (0, deferred_1.defer)();
@@ -167,7 +167,7 @@ var getUsersOnDisk;
     }
     getUsersOnDisk.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getUsersOnDisk');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getUsersOnDisk');
         return () => caller
             .startPromiseCall(path, undefined)
             .then(buf => (0, protobuf_msg_1.fixArray)(protobuf_msg_1.strArrValType.unpack(buf).values));
@@ -188,7 +188,7 @@ var startLoginToRemoteStorage;
     }
     startLoginToRemoteStorage.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('startLoginToRemoteStorage');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'startLoginToRemoteStorage');
         return address => caller
             .startPromiseCall(path, requestType.pack({ address }))
             .then(buf => protobuf_msg_1.boolValType.unpack(buf).value);
@@ -214,7 +214,7 @@ var completeLoginAndLocalSetup;
     }
     completeLoginAndLocalSetup.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('completeLoginAndLocalSetup');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'completeLoginAndLocalSetup');
         return (pass, progressCB) => {
             const s = new rxjs_1.Subject();
             const completion = (0, deferred_1.defer)();
@@ -256,7 +256,7 @@ var useExistingStorage;
     }
     useExistingStorage.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('useExistingStorage');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'useExistingStorage');
         return (address, pass, progressCB) => {
             const s = new rxjs_1.Subject();
             const completion = (0, deferred_1.defer)();

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

@@ -76,7 +76,7 @@ var getAppLocalFS;
     }
     getAppLocalFS.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getAppLocalFS');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getAppLocalFS');
         return appName => caller
             .startPromiseCall(path, requestType.pack({ appName: (0, protobuf_msg_1.toOptVal)(appName) }))
             .then(buf => {
@@ -103,7 +103,7 @@ var getAppSyncedFS;
     }
     getAppSyncedFS.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const path = objPath.concat('getAppSyncedFS');
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'getAppSyncedFS');
         return appName => caller
             .startPromiseCall(path, requestType.pack({ appName: (0, protobuf_msg_1.toOptVal)(appName) }))
             .then(buf => {
@@ -130,7 +130,7 @@ var getSysFS;
     }
     getSysFS.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getSysFS');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getSysFS');
         return (type, path) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             type, path: (0, protobuf_msg_1.toOptVal)(path)
@@ -159,7 +159,7 @@ var getUserFS;
     }
     getUserFS.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = objPath.concat('getUserFS');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'getUserFS');
         return (type, path) => caller
             .startPromiseCall(ipcPath, requestType.pack({
             type, path: (0, protobuf_msg_1.toOptVal)(path)

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

@@ -71,6 +71,7 @@ class NodesContainer {
             }
         })();
         this.promises.set(objId, envelopedPromise);
+        envelopedPromise.catch(noop);
     }
     delete(node) {
         const existing = this.get(node.objId);
@@ -93,6 +94,7 @@ class NodesContainer {
     }
 }
 exports.NodesContainer = NodesContainer;
+function noop() { }
 function wrapStorageImplementation(impl) {
     const wrap = {
         type: impl.type,

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

@@ -11,6 +11,7 @@ import { NodePersistance } from './node-persistence';
 declare type FileByteSource = web3n.files.FileByteSource;
 declare type FileByteSink = web3n.files.FileByteSink;
 declare type XAttrsChanges = web3n.files.XAttrsChanges;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 interface FileAttrs {
     attrs: CommonAttrs;
     size: number;
@@ -19,14 +20,8 @@ interface FileAttrs {
 declare class FilePersistance extends NodePersistance {
     constructor(zNonce: Uint8Array, key: Uint8Array, cryptor: AsyncSBoxCryptor);
     getAttrs(objSrc: ObjSource): Promise<FileAttrs>;
-    getFileSource(objSrc: ObjSource, getAttrs?: boolean): Promise<{
-        src: FileByteSource;
-        fileAttrs?: FileAttrs;
-    }>;
-    readBytes(objSrc: ObjSource, start: number | undefined, end: number | undefined, getAttrs?: boolean): Promise<{
-        bytes?: Uint8Array;
-        fileAttrs?: FileAttrs;
-    }>;
+    getFileSource(objSrc: ObjSource): Promise<FileByteSource>;
+    readBytes(objSrc: ObjSource, start: number | undefined, end: number | undefined): Promise<Uint8Array | undefined>;
     saveBytes(bytes: Uint8Array | Uint8Array[], version: number, attrs: CommonAttrs, xattrs: XAttrs | undefined): Promise<Subscribe>;
     getFileSink(version: number, attrs: CommonAttrs, xattrs: XAttrs | undefined, base: ObjSource | undefined): Promise<{
         sinkPromise: Promise<FileByteSink>;
@@ -48,11 +43,11 @@ export declare class FileNode extends NodeInFS<FilePersistance> {
     protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     private setUpdatedState;
     get size(): number;
-    readSrc(): Promise<{
+    readSrc(flags: VersionedReadFlags | undefined): Promise<{
         src: FileByteSource;
         version: number;
     }>;
-    readBytes(start: number | undefined, end: number | undefined): Promise<{
+    readBytes(start: number | undefined, end: number | undefined, flags: VersionedReadFlags | undefined): Promise<{
         bytes: Uint8Array | undefined;
         version: number;
     }>;

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

@@ -43,14 +43,11 @@ class FilePersistance extends node_persistence_1.NodePersistance {
         const payload = await super.readonlyPayload(objSrc);
         return await fileAttrsFrom(payload);
     }
-    async getFileSource(objSrc, getAttrs = false) {
+    async getFileSource(objSrc) {
         const payload = await this.readonlyPayload(objSrc);
-        const src = payload.makeFileByteSource();
-        return (getAttrs ?
-            { src, fileAttrs: await fileAttrsFrom(payload) } :
-            { src });
+        return payload.makeFileByteSource();
     }
-    async readBytes(objSrc, start, end, getAttrs = false) {
+    async readBytes(objSrc, start, end) {
         if ((typeof start === 'number') && (start < 0)) {
             throw new Error(`Parameter start has bad value: ${start}`);
         }
@@ -64,22 +61,18 @@ class FilePersistance extends node_persistence_1.NodePersistance {
             end = size;
         }
         else if (start >= size) {
-            return (getAttrs ? { fileAttrs: await fileAttrsFrom(payload) } : {});
+            return;
         }
         if (typeof end === 'number') {
             end = Math.min(size, end);
             if (end <= start) {
-                return (getAttrs ?
-                    { fileAttrs: await fileAttrsFrom(payload) } : {});
+                return;
             }
         }
         else {
             end = size;
         }
-        const bytes = await payload.readSomeContentBytes(start, end);
-        return (getAttrs ?
-            { bytes, fileAttrs: await fileAttrsFrom(payload) } :
-            { bytes });
+        return await payload.readSomeContentBytes(start, end);
     }
     async saveBytes(bytes, version, attrs, xattrs) {
         return super.writeWhole(bytes, version, attrs, xattrs);
@@ -139,45 +132,33 @@ class FileNode extends node_in_fs_1.NodeInFS {
     get size() {
         return this.fileSize;
     }
-    async readSrc() {
-        const objSrc = await this.storage.getObjSrc(this.objId);
-        if ((this.storage.type === 'synced') || (this.storage.type === 'local')) {
-            const version = objSrc.version;
-            if (this.version < version) {
-                const { src, fileAttrs } = await this.crypto.getFileSource(objSrc, true);
-                this.setUpdatedState(version, fileAttrs);
-                return { src, version };
-            }
-            else {
-                const { src } = await this.crypto.getFileSource(objSrc);
-                return { src, version };
-            }
+    async readSrc(flags) {
+        const objSrc = await this.getObjSrcOfVersion(flags);
+        let version;
+        if ((this.storage.type === 'synced')
+            || (this.storage.type === 'local')
+            || (this.storage.type === 'share')) {
+            version = objSrc.version;
         }
         else {
-            const { src } = await this.crypto.getFileSource(objSrc);
-            // unversioned storage passes undefined version
-            return { src, version: undefined };
+            version = undefined;
         }
+        const src = await this.crypto.getFileSource(objSrc);
+        return { src, version };
     }
-    async readBytes(start, end) {
-        const objSrc = await this.storage.getObjSrc(this.objId);
-        if ((this.storage.type === 'synced') || (this.storage.type === 'local')) {
-            const version = objSrc.version;
-            if (this.version < version) {
-                const { bytes, fileAttrs } = await this.crypto.readBytes(objSrc, start, end, true);
-                this.setUpdatedState(version, fileAttrs);
-                return { bytes, version };
-            }
-            else {
-                const { bytes } = await this.crypto.readBytes(objSrc, start, end);
-                return { bytes, version };
-            }
+    async readBytes(start, end, flags) {
+        const objSrc = await this.getObjSrcOfVersion(flags);
+        let version;
+        if ((this.storage.type === 'synced')
+            || (this.storage.type === 'local')
+            || (this.storage.type === 'share')) {
+            version = objSrc.version;
         }
         else {
-            const { bytes } = await this.crypto.readBytes(objSrc, start, end);
-            // unversioned storage passes undefined version
-            return { bytes, version: undefined };
+            version = undefined;
         }
+        const bytes = await this.crypto.readBytes(objSrc, start, end);
+        return { bytes, version };
     }
     async writeSink(truncate, currentVersion, changes) {
         const deferredSink = (0, deferred_1.defer)();

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

@@ -15,6 +15,7 @@ declare type SyncStatus = web3n.files.SyncStatus;
 declare type WritableFileVersionedAPI = web3n.files.WritableFileVersionedAPI;
 declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 declare type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 export declare class FileObject implements WritableFile, Linkable {
     name: string;
     isNew: boolean;
@@ -54,11 +55,11 @@ declare class V implements WritableFileVersionedAPI, N {
     getNode(): Promise<FileNode>;
     ensureIsWritable(): void;
     updateXAttrs(changes: XAttrsChanges): Promise<number>;
-    getXAttr(xaName: string): Promise<{
+    getXAttr(xaName: string, flags?: VersionedReadFlags): Promise<{
         attr: any;
         version: number;
     }>;
-    listXAttrs(): Promise<{
+    listXAttrs(flags?: VersionedReadFlags): Promise<{
         lst: string[];
         version: number;
     }>;
@@ -67,23 +68,23 @@ declare class V implements WritableFileVersionedAPI, N {
         sink: FileByteSink;
         version: number;
     }>;
-    getByteSource(): Promise<{
+    getByteSource(flags?: VersionedReadFlags): Promise<{
         src: FileByteSource;
         version: number;
     }>;
     writeBytes(bytes: Uint8Array): Promise<number>;
     writeTxt(txt: string): Promise<number>;
     writeJSON(json: any): Promise<number>;
-    readBytes(start?: number, end?: number): Promise<{
+    readBytes(start?: number, end?: number, flags?: VersionedReadFlags): Promise<{
         bytes: Uint8Array | undefined;
         version: number;
     }>;
-    readTxt(): Promise<{
+    readTxt(flags?: VersionedReadFlags): Promise<{
         txt: string;
         version: number;
     }>;
     copy(file: File): Promise<number>;
-    readJSON<T>(): Promise<{
+    readJSON<T>(flags?: VersionedReadFlags): Promise<{
         json: T;
         version: number;
     }>;
@@ -96,7 +97,7 @@ declare class V implements WritableFileVersionedAPI, N {
 declare class S implements WritableFileSyncAPI {
     private readonly n;
     constructor(n: N);
-    upload(opts?: OptionsToUploadLocal): Promise<void>;
+    upload(opts?: OptionsToUploadLocal): Promise<number | undefined>;
     status(): Promise<SyncStatus>;
     updateStatusInfo(): Promise<SyncStatus>;
     isRemoteVersionOnDisk(version: number): Promise<'complete' | 'partial' | 'none'>;

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

@@ -148,19 +148,13 @@ class V {
         const node = await this.getNode();
         return node.updateXAttrs(changes);
     }
-    async getXAttr(xaName) {
+    async getXAttr(xaName, flags) {
         const node = await this.getNode();
-        return {
-            attr: node.getXAttr(xaName),
-            version: node.version
-        };
+        return await node.getXAttr(xaName, flags);
     }
-    async listXAttrs() {
+    async listXAttrs(flags) {
         const node = await this.getNode();
-        return {
-            lst: node.listXAttrs(),
-            version: node.version
-        };
+        return await node.listXAttrs(flags);
     }
     async getLinkParams() {
         if (!this.node) {
@@ -176,11 +170,11 @@ class V {
         const node = await this.getNode();
         return node.writeSink(truncate, currentVersion);
     }
-    async getByteSource() {
+    async getByteSource(flags) {
         if (!this.node) {
             throw (0, file_1.makeFileException)('notFound', this.name);
         }
-        return this.node.readSrc();
+        return this.node.readSrc(flags);
     }
     async writeBytes(bytes) {
         this.ensureIsWritable();
@@ -194,14 +188,14 @@ class V {
     writeJSON(json) {
         return this.writeTxt(JSON.stringify(json));
     }
-    async readBytes(start, end) {
+    async readBytes(start, end, flags) {
         if (!this.node) {
             throw (0, file_1.makeFileException)('notFound', this.name);
         }
-        return await this.node.readBytes(start, end);
+        return await this.node.readBytes(start, end, flags);
     }
-    async readTxt() {
-        const { bytes, version } = await this.readBytes();
+    async readTxt(flags) {
+        const { bytes, version } = await this.readBytes(undefined, undefined, flags);
         const txt = (bytes ? buffer_utils_1.utf8.open(bytes) : '');
         return { txt, version };
     }
@@ -212,8 +206,8 @@ class V {
         await (0, pipe_1.pipe)(src, sink);
         return version;
     }
-    async readJSON() {
-        const { txt, version } = await this.readTxt();
+    async readJSON(flags) {
+        const { txt, version } = await this.readTxt(flags);
         const json = JSON.parse(txt);
         return { json, version };
     }

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

@@ -12,6 +12,7 @@ declare type FolderDiff = web3n.files.FolderDiff;
 declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 declare type OptionsToAdoptRemoteItem = web3n.files.OptionsToAdoptRemoteItem;
 declare type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 export interface NodeInfo {
     /**
      * This is a usual file name.
@@ -80,6 +81,10 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
         lst: ListingEntry[];
         version: number;
     };
+    listNonCurrent(flags: VersionedReadFlags): Promise<{
+        lst: ListingEntry[];
+        version: number;
+    }>;
     childExistsInSyncedVersion(childObjId: string): Promise<boolean>;
     getNodeInfo(name: string, undefOnMissing?: boolean): NodeInfo | undefined;
     hasChild(childName: string, throwIfMissing?: boolean): boolean;
@@ -137,7 +142,7 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     private removeChildrenObjsInSyncedStorage;
     private uploadRemovalOfObjs;
     getParamsForLink(): LinkParameters<FolderLinkParams>;
-    upload(opts: OptionsToUploadLocal | undefined): Promise<void>;
+    upload(opts: OptionsToUploadLocal | undefined): Promise<number | undefined>;
     private uploadRemovalOf;
     private listRemovedInTreeToUploadRm;
     protected needUpload(localVersion: number | undefined): Promise<{

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

@@ -224,6 +224,13 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             .map(nodeInfoToListingEntry);
         return { lst, version: this.version };
     }
+    async listNonCurrent(flags) {
+        const src = await this.getObjSrcOfVersion(flags);
+        const { folderInfo } = await this.crypto.read(src);
+        const lst = Object.values(folderInfo)
+            .map(nodeInfoToListingEntry);
+        return { lst, version: src.version };
+    }
     async childExistsInSyncedVersion(childObjId) {
         const { state, synced } = await this.syncStatus();
         if (state === 'synced') {
@@ -304,14 +311,14 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                 throw new Error(`Unknown type of fs node`);
             }
             deferred.resolve(node);
-            return node;
+            return deferred.promise;
         }
         catch (exc) {
-            deferred.reject(exc);
             if (exc.objNotFound) {
                 await this.fixMissingChildAndThrow(exc, info);
             }
-            throw (0, error_1.errWithCause)(exc, `Failed to instantiate fs node '${this.name}/${info.name}'`);
+            deferred.reject((0, error_1.errWithCause)(exc, `Failed to instantiate fs node '${this.name}/${info.name}'`));
+            return deferred.promise;
         }
     }
     getFolder(name, undefOnMissing = false) {
@@ -658,11 +665,14 @@ class FolderNode extends node_in_fs_1.NodeInFS {
     }
     async removeFolderObj(src, passIdsForRmUpload = false) {
         const childrenNodes = await this.doChange(true, async () => {
+            if (this.version < 0) {
+                return;
+            }
             const childrenNodes = await this.getAllNodes();
-            await this.removeThisNodeAsLeaf(src);
+            await this.removeThisFromStorageNodes(src);
             return childrenNodes;
         });
-        if (childrenNodes.length === 0) {
+        if (!childrenNodes || (childrenNodes.length === 0)) {
             return;
         }
         if (this.isInSyncedStorage) {
@@ -683,6 +693,9 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         }
     }
     async removeChildrenObjsInSyncedStorage(childrenNodes, src, passIdsForRmUpload) {
+        if (this.version < 0) {
+            return;
+        }
         let uploadRmsHere;
         let collectedIds;
         if (passIdsForRmUpload) {
@@ -764,8 +777,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                 return;
             }
             if (toUpload.createOnRemote) {
-                await super.upload(opts);
-                return;
+                return await super.upload(opts);
             }
             const storage = this.syncedStorage();
             const { localVersion, uploadVersion } = toUpload;
@@ -777,13 +789,13 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                 // we also don't await for chidren removal
                 this.uploadRemovalOf(removedNodes);
             }
+            return uploadVersion;
         }
         catch (exc) {
             throw (0, common_1.setPathInExc)(exc, this.name);
         }
     }
     async uploadRemovalOf(removedNodes) {
-        const storage = this.syncedStorage();
         const rmObjs = [];
         for (const node of removedNodes) {
             (0, for_arrays_1.appendArray)(rmObjs, await this.listRemovedInTreeToUploadRm(node));

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

@@ -21,6 +21,7 @@ declare type FSCollection = web3n.files.FSCollection;
 declare type FileFlags = web3n.files.FileFlags;
 declare type FileByteSource = web3n.files.FileByteSource;
 declare type FileByteSink = web3n.files.FileByteSink;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 declare type XAttrsChanges = web3n.files.XAttrsChanges;
 declare type WritableFSSyncAPI = web3n.files.WritableFSSyncAPI;
 declare type SyncStatus = web3n.files.SyncStatus;
@@ -39,7 +40,7 @@ export declare class XspFS implements WritableFS {
     private constructor();
     private storage;
     readonlySubRoot(path: string): Promise<ReadonlyFS>;
-    writableSubRoot(path: string, flags?: web3n.files.VersionedFileFlags): Promise<WritableFS>;
+    writableSubRoot(path: string, flags?: web3n.files.VersionedFileWriteFlags): Promise<WritableFS>;
     /**
      * This creates in a root object in a given storage, returning fs object
      * representing created root.
@@ -88,7 +89,7 @@ export declare class XspFS implements WritableFS {
     watchFile(path: string, observer: Observer<FileEvent>): () => void;
     watchTree(path: string, depth: number | undefined, observer: Observer<FolderEvent | FileEvent>): () => void;
     readonlyFile(path: string): Promise<ReadonlyFile>;
-    writableFile(path: string, flags?: web3n.files.VersionedFileFlags): Promise<WritableFile>;
+    writableFile(path: string, flags?: web3n.files.VersionedFileWriteFlags): Promise<WritableFile>;
     copyFile(src: string, dst: string, overwrite?: boolean): Promise<void>;
     saveFile(file: File, dst: string, overwrite?: boolean): Promise<void>;
     listFolder(folder: string): Promise<ListingEntry[]>;
@@ -96,10 +97,10 @@ export declare class XspFS implements WritableFS {
     readTxtFile(path: string): Promise<string>;
     readBytes(path: string, start?: number, end?: number): Promise<Uint8Array | undefined>;
     getByteSource(path: string): Promise<FileByteSource>;
-    writeJSONFile(path: string, json: any, flags?: web3n.files.VersionedFileFlags): Promise<void>;
-    writeTxtFile(path: string, txt: string, flags?: web3n.files.VersionedFileFlags): Promise<void>;
-    writeBytes(path: string, bytes: Uint8Array, flags?: web3n.files.VersionedFileFlags): Promise<void>;
-    getByteSink(path: string, flags?: web3n.files.VersionedFileFlags): Promise<FileByteSink>;
+    writeJSONFile(path: string, json: any, flags?: web3n.files.VersionedFileWriteFlags): Promise<void>;
+    writeTxtFile(path: string, txt: string, flags?: web3n.files.VersionedFileWriteFlags): Promise<void>;
+    writeBytes(path: string, bytes: Uint8Array, flags?: web3n.files.VersionedFileWriteFlags): Promise<void>;
+    getByteSink(path: string, flags?: web3n.files.VersionedFileWriteFlags): Promise<FileByteSink>;
 }
 interface N {
     get(path: string): Promise<NodeInFS<any>>;
@@ -121,38 +122,38 @@ declare class V implements WritableFSVersionedAPI, N {
     get(path: string): Promise<NodeInFS<any>>;
     ensureIsWritable(): void;
     updateXAttrs(path: string, changes: XAttrsChanges): Promise<number>;
-    getXAttr(path: string, xaName: string): Promise<{
+    getXAttr(path: string, xaName: string, flags?: VersionedReadFlags): Promise<{
         attr: any;
         version: number;
     }>;
-    listXAttrs(path: string): Promise<{
+    listXAttrs(path: string, flags?: VersionedReadFlags): Promise<{
         lst: string[];
         version: number;
     }>;
-    listFolder(path: string): Promise<{
+    listFolder(path: string, flags?: VersionedReadFlags): Promise<{
         lst: ListingEntry[];
         version: number;
     }>;
-    writeBytes(path: string, bytes: Uint8Array, flags?: web3n.files.VersionedFileFlags): Promise<number>;
-    readBytes(path: string, start?: number, end?: number): Promise<{
+    writeBytes(path: string, bytes: Uint8Array, flags?: web3n.files.VersionedFileWriteFlags): Promise<number>;
+    readBytes(path: string, start?: number, end?: number, flags?: VersionedReadFlags): Promise<{
         bytes: Uint8Array | undefined;
         version: number;
     }>;
-    writeTxtFile(path: string, txt: string, flags?: web3n.files.VersionedFileFlags): Promise<number>;
-    readTxtFile(path: string): Promise<{
+    writeTxtFile(path: string, txt: string, flags?: web3n.files.VersionedFileWriteFlags): Promise<number>;
+    readTxtFile(path: string, flags?: VersionedReadFlags): Promise<{
         txt: string;
         version: number;
     }>;
-    writeJSONFile(path: string, json: any, flags?: web3n.files.VersionedFileFlags): Promise<number>;
-    readJSONFile<T>(path: string): Promise<{
+    writeJSONFile(path: string, json: any, flags?: web3n.files.VersionedFileWriteFlags): Promise<number>;
+    readJSONFile<T>(path: string, flags?: VersionedReadFlags): Promise<{
         json: T;
         version: number;
     }>;
-    getByteSink(path: string, flags?: web3n.files.VersionedFileFlags): Promise<{
+    getByteSink(path: string, flags?: web3n.files.VersionedFileWriteFlags): Promise<{
         sink: FileByteSink;
         version: number;
     }>;
-    getByteSource(path: string): Promise<{
+    getByteSource(path: string, flags?: VersionedReadFlags): Promise<{
         src: FileByteSource;
         version: number;
     }>;
@@ -160,7 +161,7 @@ declare class V implements WritableFSVersionedAPI, N {
 declare class S implements WritableFSSyncAPI {
     private readonly n;
     constructor(n: N);
-    upload(path: string, opts?: OptionsToUploadLocal): Promise<void>;
+    upload(path: string, opts?: OptionsToUploadLocal): Promise<number | undefined>;
     status(path: string): Promise<SyncStatus>;
     updateStatusInfo(path: string): Promise<SyncStatus>;
     isRemoteVersionOnDisk(path: string, version: number): Promise<'complete' | 'partial' | 'none'>;