core-3nweb-client-lib 0.43.15 → 0.43.17

package/build/lib-client/fs-utils/files.js

@@ -244,6 +244,7 @@ function wrapWritableFSSyncAPI(sImpl) {
         statRemoteItem: sImpl.statRemoteItem.bind(sImpl),
         listRemoteFolderItem: sImpl.listRemoteFolderItem.bind(sImpl),
         getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
+        getRemoteFolderItem: sImpl.getRemoteFolderItem.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -305,6 +306,7 @@ function wrapReadonlyFSSyncAPI(sImpl) {
         statRemoteItem: sImpl.statRemoteItem.bind(sImpl),
         listRemoteFolderItem: sImpl.listRemoteFolderItem.bind(sImpl),
         getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
+        getRemoteFolderItem: sImpl.getRemoteFolderItem.bind(sImpl),
         diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
     };
     return Object.freeze(w);

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

@@ -165,5 +165,6 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     private diffWithArchivedRemote;
     private diffWithRemote;
     getRemoteItemNode<T extends NodeInFS<any>>(remoteItemName: string, remoteVersion: number | undefined): Promise<T>;
+    getStorage(): Storage;
 }
 export {};

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

@@ -334,6 +334,9 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             if (exc.objNotFound && fromCurrentNodes) {
                 await this.fixMissingChildAndThrow(exc, info);
             }
+            else if (exc.failedCipherVerification) {
+                exc = (0, file_1.makeFileException)('ioError', `${this.name}/${info.name}`, exc);
+            }
             deferred.reject((0, error_1.errWithCause)(exc, `Failed to instantiate fs node '${this.name}/${info.name}'`));
             return nodeSet;
         }
@@ -1076,6 +1079,9 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         const remoteChildNodeInfo = await this.getRemoteChildNodeInfo(remoteItemName, remoteVersion);
         return await this.getOrMakeChildNodeForInfo(remoteChildNodeInfo, false);
     }
+    getStorage() {
+        return this.storage;
+    }
 }
 exports.FolderNode = FolderNode;
 Object.freeze(FolderNode.prototype);

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

@@ -56,6 +56,7 @@ export declare class XspFS implements WritableFS {
      */
     static fromExistingRoot(storage: Storage, key: Uint8Array): Promise<WritableFS>;
     static fromASMailMsgRootFromJSON(storage: Storage, folderJson: FolderInJSON, rootName?: string): ReadonlyFS;
+    static fromFolderNode(folderNode: FolderNode): ReadonlyFS;
     /**
      * Note that this method doesn't close storage.
      */
@@ -180,5 +181,6 @@ declare class S implements WritableFSSyncAPI {
     statRemoteItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<Stats>;
     listRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ListingEntry[]>;
     getRemoteFileItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFile>;
+    getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
 }
 export {};

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

@@ -77,8 +77,7 @@ class XspFS {
         const pathParts = splitPathIntoParts(path);
         const root = this.v.getRootIfNotClosed(path);
         const folder = await root.getFolderInThisSubTree(pathParts, false).catch(setExcPath(path));
-        const folderName = ((pathParts.length === 0) ?
-            this.name : pathParts[pathParts.length - 1]);
+        const folderName = ((pathParts.length === 0) ? this.name : pathParts[pathParts.length - 1]);
         const fs = new XspFS(this.storage(), false, folder, folderName);
         return (0, files_1.wrapReadonlyFS)(fs);
     }
@@ -86,8 +85,7 @@ class XspFS {
         const pathParts = splitPathIntoParts(path);
         const root = this.v.getRootIfNotClosed(path);
         const folder = await root.getFolderInThisSubTree(pathParts, flags.create, flags.exclusive).catch(setExcPath(path));
-        const folderName = ((pathParts.length === 0) ?
-            this.name : pathParts[pathParts.length - 1]);
+        const folderName = ((pathParts.length === 0) ? this.name : pathParts[pathParts.length - 1]);
         const fs = new XspFS(this.storage(), true, folder, folderName);
         return (0, files_1.wrapWritableFS)(fs);
     }
@@ -119,6 +117,10 @@ class XspFS {
         const fs = new XspFS(storage, false, root, rootName);
         return (0, files_1.wrapIntoVersionlessReadonlyFS)(fs);
     }
+    static fromFolderNode(folderNode) {
+        const fs = new XspFS(folderNode.getStorage(), false, folderNode, folderNode.name);
+        return (0, files_1.wrapIntoVersionlessReadonlyFS)(fs);
+    }
     /**
      * Note that this method doesn't close storage.
      */
@@ -835,6 +837,16 @@ class S {
             throw (0, file_1.makeFileException)('notFile', `${path}/${remoteItemName}`);
         }
     }
+    async getRemoteFolderItem(path, remoteItemName, remoteVersion) {
+        const folderNode = await this.getFolderNode(path);
+        const remoteChild = await folderNode.getRemoteItemNode(remoteItemName, remoteVersion);
+        if (remoteChild.type === 'folder') {
+            return XspFS.fromFolderNode(remoteChild);
+        }
+        else {
+            throw (0, file_1.makeFileException)('notDirectory', `${path}/${remoteItemName}`);
+        }
+    }
 }
 Object.freeze(S.prototype);
 Object.freeze(S);

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

@@ -529,14 +529,22 @@ Object.freeze(NodeInFS.prototype);
 Object.freeze(NodeInFS);
 function copyWithPathIfRemoteEvent(e, path) {
     switch (e.type) {
-        case 'remote-change':
-            return { type: e.type, path, newVersion: e.newVersion };
-        case 'remote-removal':
-            return { type: e.type, path };
-        case 'remote-version-archival':
-            return { type: e.type, path, archivedVersion: e.archivedVersion };
-        case 'remote-arch-ver-removal':
-            return { type: e.type, path, removedArchVer: e.removedArchVer };
+        case 'remote-change': {
+            const { type, syncStatus, newRemoteVersion } = e;
+            return { type, syncStatus, newRemoteVersion, path };
+        }
+        case 'remote-removal': {
+            const { syncStatus, type } = e;
+            return { syncStatus, type, path };
+        }
+        case 'remote-version-archival': {
+            const { archivedVersion, syncStatus, type } = e;
+            return { archivedVersion, syncStatus, type, path };
+        }
+        case 'remote-arch-ver-removal': {
+            const { removedArchVer, syncStatus, type } = e;
+            return { removedArchVer, syncStatus, type, path };
+        }
         default:
             return e;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.43.15",
+  "version": "0.43.17",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",

package/protos/fs.proto

@@ -530,6 +530,10 @@ message RemoteChildRequestBody {
 // Request body is RemoteChildRequestBody
 // Reply body is file.File
 
+// --- ReadonlyFSSyncAPI.getRemoteFolderItem ---
+// Request body is RemoteChildRequestBody
+// Reply body is FS
+
 
 // ==== WritableFSSyncAPI referable object ====