core-3nweb-client-lib 0.27.8 → 0.27.10

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

@@ -42,7 +42,7 @@ export declare class NodesContainer {
         node?: T;
         nodePromise?: Promise<T>;
     };
-    setPromise(objId: string, promise: Promise<Node>): void;
+    setPromise<T extends Node>(objId: string, promise: Promise<T>): Promise<T>;
     delete(node: Node): boolean;
     reserveId(objId: string): boolean;
     clear(): void;

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

@@ -44,7 +44,7 @@ class NodesContainer {
     }
     set(node) {
         const existing = this.nodes.get(node.objId);
-        if (existing) {
+        if (existing && (existing !== node)) {
             throw new Error(`Cannot add second node for the same id ${node.objId}`);
         }
         this.nodes.set(node.objId, node);
@@ -72,6 +72,7 @@ class NodesContainer {
         })();
         this.promises.set(objId, envelopedPromise);
         envelopedPromise.catch(noop);
+        return envelopedPromise;
     }
     delete(node) {
         const existing = this.get(node.objId);

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

@@ -127,7 +127,16 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         return rf;
     }
     static async rootFromLinkParams(storage, params) {
-        const existingNode = storage.nodes.get(params.objId);
+        let { node: existingNode, nodePromise } = storage.nodes.getNodeOrPromise(params.objId);
+        if (nodePromise) {
+            try {
+                existingNode = await nodePromise;
+            }
+            catch (err) {
+                // ignore errors from other invokation
+                return FolderNode.rootFromLinkParams(storage, params);
+            }
+        }
         if (existingNode) {
             if (existingNode.type !== 'folder') {
                 throw new Error(`Existing object ${params.objId} type is ${existingNode.type}, while link parameters ask for folder.`);
@@ -135,12 +144,16 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             // Note that, although we return existing folder node, we should check
             // if link parameters contained correct key. Only holder of a correct
             // key may use existing object.
-            existingNode.crypto.compareKey(params.fKey);
+            if (!existingNode.crypto.compareKey(params.fKey)) {
+                throw new Error(`Link parameters don't contain correct key to instantiate target folder.`);
+            }
             return existingNode;
         }
-        const src = await storage.getObjSrc(params.objId);
-        const key = buffer_utils_1.base64.open(params.fKey);
-        return FolderNode.rootFromObjBytes(storage, params.folderName, params.objId, src, key);
+        return await storage.nodes.setPromise(params.objId, storage.getObjSrc(params.objId)
+            .then(async (src) => {
+            const key = buffer_utils_1.base64.open(params.fKey);
+            return FolderNode.rootFromObjBytes(storage, params.folderName, params.objId, src, key);
+        }));
     }
     static rootFromJSON(storage, name, folderJson) {
         const rf = new FolderNode(storage, name, 'readonly-root', EMPTY_ARR, 0, undefined, EMPTY_ARR, false);
@@ -294,7 +307,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             return nodePromise;
         }
         const deferred = (0, deferred_1.defer)();
-        this.storage.nodes.setPromise(info.objId, deferred.promise);
+        const nodeSet = this.storage.nodes.setPromise(info.objId, deferred.promise);
         try {
             let node;
             if (info.isFile) {
@@ -311,14 +324,14 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                 throw new Error(`Unknown type of fs node`);
             }
             deferred.resolve(node);
-            return deferred.promise;
+            return nodeSet;
         }
         catch (exc) {
             if (exc.objNotFound) {
                 await this.fixMissingChildAndThrow(exc, info);
             }
             deferred.reject((0, error_1.errWithCause)(exc, `Failed to instantiate fs node '${this.name}/${info.name}'`));
-            return deferred.promise;
+            return nodeSet;
         }
     }
     getFolder(name, undefOnMissing = false) {

package/package.json

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