core-3nweb-client-lib 0.27.1 → 0.27.3

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

@@ -29,6 +29,7 @@ const exceptions_1 = require("../exceptions");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const attrs_1 = require("./attrs");
+const assert_1 = require("../../../lib-common/assert");
 class NodeInFS {
     constructor(storage, type, name, objId, currentVersion, parentId) {
         this.storage = storage;
@@ -124,7 +125,7 @@ class NodeInFS {
         else {
             if (version) {
                 if (this.currentVersion !== version) {
-                    throw (0, file_1.makeFileException)(file_1.Code.versionMismatch, this.name);
+                    throw (0, file_1.makeFileException)('versionMismatch', this.name);
                 }
             }
             else {
@@ -135,15 +136,11 @@ class NodeInFS {
             return version;
         }
     }
-    removeObj(src = 'local') {
-        return this.doChange(true, () => this.delete(src));
+    removeNonFolderObj(src) {
+        (0, assert_1.assert)(this.type !== 'folder');
+        return this.doChange(true, () => this.removeThisNodeAsLeaf(src));
     }
-    /**
-     * This non-synchronized method deletes object from storage, and detaches
-     * this node from storage. Make sure to call it inside access synchronization
-     * construct.
-     */
-    async delete(src) {
+    async removeThisNodeAsLeaf(src) {
         await this.storage.removeObj(this.objId);
         this.storage.nodes.delete(this);
         this.currentVersion = -1;
@@ -171,11 +168,11 @@ class NodeInFS {
             this.writeProc = new synced_1.SingleProc();
         }
         if (!awaitPrevChange && this.writeProc.isProcessing()) {
-            throw (0, file_1.makeFileException)(file_1.Code.concurrentUpdate, this.name + ` type ${this.type}`);
+            throw (0, file_1.makeFileException)('concurrentUpdate', this.name + ` type ${this.type}`);
         }
         const res = await this.writeProc.startOrChain(async () => {
             if (this.currentVersion < 0) {
-                throw (0, file_1.makeFileException)(file_1.Code.notFound, this.name, `Object is marked removed`);
+                throw (0, file_1.makeFileException)('notFound', this.name, `Object is marked removed`);
             }
             try {
                 const res = await change();
@@ -187,17 +184,17 @@ class NodeInFS {
                 }
                 if (exc.type === 'storage') {
                     if (exc.concurrentTransaction) {
-                        throw (0, file_1.makeFileException)(file_1.Code.concurrentUpdate, this.name, exc);
+                        throw (0, file_1.makeFileException)('concurrentUpdate', this.name, exc);
                     }
                     else if (exc.objNotFound) {
-                        throw (0, file_1.makeFileException)(file_1.Code.notFound, this.name, exc);
+                        throw (0, file_1.makeFileException)('notFound', this.name, exc);
                     }
                 }
                 else if ((exc.type === 'file')
                     || (exc.type === 'fs-sync')) {
                     throw exc;
                 }
-                throw (0, file_1.makeFileException)(file_1.Code.ioError, this.name, exc);
+                throw (0, file_1.makeFileException)('ioError', this.name, exc);
             }
         });
         return res;
@@ -258,7 +255,7 @@ class NodeInFS {
     async updateStatusInfo() {
         const storage = this.syncedStorage();
         const status = await storage.updateStatusInfo(this.objId);
-        return await this.syncStatus();
+        return status;
     }
     isSyncedVersionOnDisk(version) {
         const storage = this.syncedStorage();
@@ -350,8 +347,7 @@ class NodeInFS {
                 return;
             }
             const { localVersion, createOnRemote, uploadVersion } = toUpload;
-            const uploadHeader = ((localVersion === uploadVersion) ? undefined :
-                await this.uploadHeaderChange(localVersion, uploadVersion));
+            const uploadHeader = await this.uploadHeaderChange(localVersion, uploadVersion);
             const storage = this.syncedStorage();
             await storage.upload(this.objId, localVersion, uploadVersion, uploadHeader, createOnRemote);
             await this.doChange(true, async () => {
@@ -366,6 +362,9 @@ class NodeInFS {
         }
     }
     async uploadHeaderChange(localVersion, uploadVersion) {
+        if (localVersion === uploadVersion) {
+            return;
+        }
         const currentSrc = await this.storage.getObjSrc(this.objId, localVersion);
         const localHeader = await currentSrc.readHeader();
         const uploadHeader = await this.crypto.reencryptHeader(localHeader, uploadVersion);

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

@@ -82,6 +82,6 @@ class ReadonlyPayloadV1 {
 Object.freeze(ReadonlyPayloadV1.prototype);
 Object.freeze(ReadonlyPayloadV1);
 function makeEndlessException() {
-    return (0, file_1.makeFileException)(file_1.Code.isEndless, '');
+    return (0, file_1.makeFileException)('isEndless', '');
 }
 Object.freeze(exports);