@telecrypt-io/storage 0.5.29 → 0.5.30

package/dist/core/operations.js

@@ -205,37 +205,6 @@ async function resolveFile(storage, tree, fileId, signal) {
         throw new StorageError("file lookup failed", { cause: error });
     }
 }
-function snapshotTreeSpaces(root, tooLargeMessage = "storage tree is too large") {
-    const spaces = [];
-    const seen = new Set();
-    const pending = [{ tree: root, depth: 0 }];
-    while (pending.length > 0) {
-        const next = pending.pop();
-        if (!next)
-            continue;
-        const { tree, depth } = next;
-        if (seen.has(tree.id))
-            continue;
-        if (depth > MAX_DELETION_DEPTH || spaces.length >= MAX_DELETION_ROOMS) {
-            throw new StorageError(tooLargeMessage);
-        }
-        seen.add(tree.id);
-        spaces.push(tree);
-        let children;
-        try {
-            children = tree.getDirectories();
-        }
-        catch (error) {
-            throw new StorageError("could not enumerate storage space descendants safely", { cause: error });
-        }
-        if (children.length > MAX_DELETION_ROOMS) {
-            throw new StorageError(tooLargeMessage);
-        }
-        for (const child of children)
-            pending.push({ tree: child, depth: depth + 1 });
-    }
-    return spaces;
-}
 /**
  * Deleting a tree is deliberately a one-room operation.  File versions are
  * physical Matrix media events, so callers must delete files explicitly and
@@ -318,6 +287,62 @@ function isActiveRelationEvent(event) {
         !Array.isArray(content) &&
         Object.keys(content).length > 0);
 }
+function activeTreeDirectories(client, tree) {
+    const childEvents = readRelationEvents(client, tree.id, EventType.SpaceChild);
+    if (childEvents === null)
+        throw new StorageError("delete graph is unsafe");
+    const activeChildIds = new Set();
+    for (const event of childEvents) {
+        if (!isActiveRelationEvent(event))
+            continue;
+        const childId = relationStateKey(event);
+        if (!childId)
+            throw new StorageError("delete graph is unsafe");
+        activeChildIds.add(childId);
+    }
+    const knownChildren = new Map(tree.getDirectories().map((child) => [child.id, child]));
+    return [...activeChildIds].map((childId) => {
+        const child = knownChildren.get(childId);
+        if (!child)
+            throw new StorageError("delete graph is unsafe");
+        return child;
+    });
+}
+function snapshotTreeSpaces(root, tooLargeMessage = "storage tree is too large", activeRelationClient) {
+    const spaces = [];
+    const seen = new Set();
+    const pending = [{ tree: root, depth: 0 }];
+    while (pending.length > 0) {
+        const next = pending.pop();
+        if (!next)
+            continue;
+        const { tree, depth } = next;
+        if (seen.has(tree.id))
+            continue;
+        if (depth > MAX_DELETION_DEPTH || spaces.length >= MAX_DELETION_ROOMS) {
+            throw new StorageError(tooLargeMessage);
+        }
+        seen.add(tree.id);
+        spaces.push(tree);
+        let children;
+        try {
+            children = activeRelationClient
+                ? activeTreeDirectories(activeRelationClient, tree)
+                : tree.getDirectories();
+        }
+        catch (error) {
+            if (error instanceof StorageError)
+                throw error;
+            throw new StorageError("could not enumerate storage space descendants safely", { cause: error });
+        }
+        if (children.length > MAX_DELETION_ROOMS) {
+            throw new StorageError(tooLargeMessage);
+        }
+        for (const child of children)
+            pending.push({ tree: child, depth: depth + 1 });
+    }
+    return spaces;
+}
 /**
  * A deleted MSC3089 branch is represented by an authoritative empty state
  * event. Inactive branches with metadata are historical versions, and a
@@ -358,13 +383,7 @@ function validateDeletionGraph(client, root, ids, deletedRooms) {
         const tree = client.unstableGetFileTreeSpace(id);
         if (!tree)
             throw new StorageError("delete graph is unsafe");
-        let directories;
-        try {
-            directories = tree.getDirectories();
-        }
-        catch (error) {
-            throw new StorageError("delete graph is unsafe", { cause: error });
-        }
+        const directories = activeTreeDirectories(client, tree);
         for (const child of directories)
             addEdge(id, child.id);
         const childEvents = readRelationEvents(client, id, EventType.SpaceChild);
@@ -1013,8 +1032,7 @@ export async function listSubfolders(storage, parentId, options) {
         const tree = await resolveTree(storage, parentId, signal);
         await storage.refreshRoomState(parentId, { signal });
         ensureOperationActive(signal);
-        const directories = tree
-            .getDirectories()
+        const directories = activeTreeDirectories(storage.getClient(), tree)
             .filter((directory) => !isMarkedTreeDeleted(storage, directory.id));
         return directories.map((d) => ({ id: d.id, name: d.room.name }));
     });
@@ -1094,7 +1112,7 @@ async function deleteTree(storage, treeId, options) {
                 // part of this operation and must not block deletion merely because
                 // their membership is not joined.
                 await refreshDeletionRooms(storage, tree.id, operation.signal);
-                const spaces = snapshotTreeSpaces(tree, "delete graph is too large");
+                const spaces = snapshotTreeSpaces(tree, "delete graph is too large", client);
                 const activeSpaces = spaces.filter((space) => !removedRooms.has(space.id));
                 const ids = new Set(activeSpaces.map((space) => space.id));
                 if (!ids.has(tree.id)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telecrypt-io/storage",
-  "version": "0.5.29",
+  "version": "0.5.30",
   "license": "BUSL-1.1",
   "type": "module",
   "packageManager": "npm@11.19.0",