core-3nweb-client-lib 0.27.3 → 0.27.4

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

@@ -32,6 +32,7 @@ const pipe_1 = require("../../../lib-common/byte-streaming/pipe");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const node_in_fs_1 = require("./node-in-fs");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 function splitPathIntoParts(path) {
     return path_1.posix.resolve('/', path).split('/').filter(part => !!part);
@@ -550,38 +551,36 @@ class V {
         const node = await this.get(path);
         return node.updateXAttrs(changes);
     }
-    async getXAttr(path, xaName) {
+    async getXAttr(path, xaName, flags) {
         const node = await this.get(path);
-        const attr = node.getXAttr(xaName);
-        return { attr, version: node.version };
+        return await node.getXAttr(xaName, flags);
     }
-    async listXAttrs(path) {
+    async listXAttrs(path, flags) {
         const node = await this.get(path);
-        return {
-            lst: node.listXAttrs(),
-            version: node.version
-        };
+        return node.listXAttrs(flags);
     }
-    async listFolder(path) {
+    async listFolder(path, flags) {
         const root = this.getRootIfNotClosed(path);
         const folder = await root.getFolderInThisSubTree(splitPathIntoParts(path), false).catch(setExcPath(path));
-        return folder.list();
+        return ((0, node_in_fs_1.shouldReadCurrentVersion)(flags) ?
+            folder.list() :
+            folder.listNonCurrent(flags));
     }
     async writeBytes(path, bytes, flags = WRITE_NONEXCL_FLAGS) {
         this.ensureIsWritable();
         const f = await this.getOrCreateFile(path, flags);
         return f.save(bytes);
     }
-    async readBytes(path, start, end) {
+    async readBytes(path, start, end, flags) {
         const file = await this.getOrCreateFile(path, {});
-        return await file.readBytes(start, end);
+        return await file.readBytes(start, end, flags);
     }
     writeTxtFile(path, txt, flags = WRITE_NONEXCL_FLAGS) {
         const bytes = buffer_utils_1.utf8.pack(txt);
         return this.writeBytes(path, bytes, flags);
     }
-    async readTxtFile(path) {
-        const { bytes, version } = await this.readBytes(path);
+    async readTxtFile(path, flags) {
+        const { bytes, version } = await this.readBytes(path, undefined, undefined, flags);
         try {
             const txt = (bytes ? buffer_utils_1.utf8.open(bytes) : '');
             return { txt, version };
@@ -594,8 +593,8 @@ class V {
         const txt = JSON.stringify(json);
         return this.writeTxtFile(path, txt, flags);
     }
-    async readJSONFile(path) {
-        const { txt, version } = await this.readTxtFile(path);
+    async readJSONFile(path, flags) {
+        const { txt, version } = await this.readTxtFile(path, flags);
         try {
             const json = JSON.parse(txt);
             return { json, version };
@@ -609,9 +608,9 @@ class V {
         const f = await this.getOrCreateFile(path, flags);
         return f.writeSink(flags.truncate, flags.currentVersion);
     }
-    async getByteSource(path) {
+    async getByteSource(path, flags) {
         const f = await this.getOrCreateFile(path, {});
-        return f.readSrc();
+        return f.readSrc(flags);
     }
 }
 Object.freeze(V.prototype);

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

@@ -9,6 +9,7 @@ declare type XAttrsChanges = web3n.files.XAttrsChanges;
 declare type SyncStatus = web3n.files.SyncStatus;
 declare type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 declare type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
+declare type VersionedReadFlags = web3n.files.VersionedReadFlags;
 export declare abstract class NodeInFS<P extends NodePersistance> implements Node {
     protected readonly storage: Storage;
     readonly type: NodeType;
@@ -24,6 +25,7 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
     protected setCurrentVersion(newVersion: number): void;
     readonly isInSyncedStorage: boolean;
     protected constructor(storage: Storage, type: NodeType, name: string, objId: string, currentVersion: number, parentId: string | undefined);
+    protected getObjSrcOfVersion(flags: VersionedReadFlags | undefined): Promise<ObjSource>;
     private updatedXAttrs;
     protected setUpdatedParams(version: number, attrs: CommonAttrs | undefined, xattrs: XAttrs | undefined): void;
     protected getParamsForUpdate(changes: XAttrsChanges | undefined): {
@@ -32,8 +34,14 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
         xattrs?: XAttrs;
     };
     updateXAttrs(changes: XAttrsChanges): Promise<number>;
-    getXAttr(xaName: string): any;
-    listXAttrs(): string[];
+    getXAttr(xaName: string, flags: VersionedReadFlags | undefined): Promise<{
+        attr: any;
+        version: number;
+    }>;
+    listXAttrs(flags: VersionedReadFlags | undefined): Promise<{
+        lst: string[];
+        version: number;
+    }>;
     getAttrs(): CommonAttrs;
     listVersions(): Promise<{
         current?: number;
@@ -77,4 +85,5 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
     upload(opts: OptionsToUploadLocal | undefined): Promise<void>;
     protected uploadHeaderChange(localVersion: number, uploadVersion: number): Promise<UploadHeaderChange | undefined>;
 }
+export declare function shouldReadCurrentVersion(flags: VersionedReadFlags | undefined): boolean;
 export {};

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

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeInFS = void 0;
+exports.shouldReadCurrentVersion = exports.NodeInFS = void 0;
 /**
  * Everything in this module is assumed to be inside of a file system
  * reliance set.
@@ -58,6 +58,19 @@ class NodeInFS {
         }
         this.currentVersion = newVersion;
     }
+    getObjSrcOfVersion(flags) {
+        if (flags) {
+            const { remoteVersion, archivedVersion } = flags;
+            if (remoteVersion) {
+                const store = this.syncedStorage();
+                return store.getObjSrcOfRemoteVersion(this.objId, remoteVersion);
+            }
+            else if (archivedVersion) {
+                return this.storage.getObjSrc(this.objId, archivedVersion, true);
+            }
+        }
+        return this.storage.getObjSrc(this.objId);
+    }
     updatedXAttrs(changes) {
         return (this.xattrs ?
             (changes ? this.xattrs.makeUpdated(changes) : this.xattrs) :
@@ -90,11 +103,39 @@ class NodeInFS {
             return this.version;
         });
     }
-    getXAttr(xaName) {
-        return (this.xattrs ? this.xattrs.get(xaName) : undefined);
+    async getXAttr(xaName, flags) {
+        if (shouldReadCurrentVersion(flags)) {
+            return {
+                attr: (this.xattrs ? this.xattrs.get(xaName) : undefined),
+                version: this.version
+            };
+        }
+        else {
+            const src = await this.getObjSrcOfVersion(flags);
+            const payload = await this.crypto.readonlyPayload(src);
+            const xattrs = await payload.getXAttrs();
+            return {
+                attr: xattrs.get(xaName),
+                version: src.version
+            };
+        }
     }
-    listXAttrs() {
-        return (this.xattrs ? this.xattrs.list() : []);
+    async listXAttrs(flags) {
+        if (shouldReadCurrentVersion(flags)) {
+            return {
+                lst: (this.xattrs ? this.xattrs.list() : []),
+                version: this.version
+            };
+        }
+        else {
+            const src = await this.getObjSrcOfVersion(flags);
+            const payload = await this.crypto.readonlyPayload(src);
+            const xattrs = await payload.getXAttrs();
+            return {
+                lst: xattrs.list(),
+                version: src.version
+            };
+        }
     }
     getAttrs() {
         return this.attrs;
@@ -388,4 +429,14 @@ function copyWithPathIfRemoteEvent(e, path) {
             return e;
     }
 }
+function shouldReadCurrentVersion(flags) {
+    if (flags) {
+        const { archivedVersion, remoteVersion } = flags;
+        if (archivedVersion || remoteVersion) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.shouldReadCurrentVersion = shouldReadCurrentVersion;
 Object.freeze(exports);