@telecrypt-io/storage 0.5.31 → 0.6.1

package/README.md

@@ -19,7 +19,7 @@ is maintained in its own repository.
 ## Install
 
 ```bash
-npm install @telecrypt-io/storage@0.5.28
+npm install @telecrypt-io/storage@0.6.0
 ```
 
 This gives you the `TeleCryptIOStorage` library and its browser-safe `core` API.
@@ -91,20 +91,19 @@ a file tree using Matrix primitives:
 | Vault | A Space (room marked as a file tree) |
 | Folder | A child Space |
 | File | An event pointing at encrypted uploaded content |
-| Version | A newer event superseding the old |
 | Sharing | Room invitation |
 | Permissions | Power levels |
 
 ### Deletion
 
 Vaults and folders are deleted only when they are empty. Delete each file first; deleting a file
-also removes its complete Matrix version chain and reports a typed partial result if cleanup stops
-after some versions. Delete empty child folders before deleting their parent. A nonempty delete
+also removes its encrypted media object before redacting its Matrix event. Delete empty child
+folders before deleting their parent. A nonempty delete
 fails with `NonEmptyTreeError`, so a shared or nested tree is never removed implicitly.
 
 Encryption uses the same scheme as Matrix attachments (AES-CTR with a per-file key, keys
 distributed via the room's Megolm session). File deletion uses TeleCrypt's authenticated Synapse
-storage extension to remove the local media and thumbnail objects before Matrix redaction; stock
+storage extension to remove the local media object before Matrix redaction; stock
 Synapse without that extension cannot provide the SDK deletion contract.
 
 ## Development

package/dist/TeleCryptIOStorage.d.ts

@@ -20,15 +20,14 @@ export interface TreeSpace {
     setPermissions(userId: string, role: string): Promise<void>;
     getFile(fileEventId: string): FileBranch | null;
     listFiles(): FileBranch[];
-    listAllFiles(): FileBranch[];
     createFile(name: string, encryptedContents: ArrayBuffer | Uint8Array, info: Record<string, unknown>, additionalContent?: Record<string, unknown>): Promise<{
         event_id: string;
     }>;
 }
 export interface FileBranch {
     readonly id: string;
-    readonly version: number;
-    readonly isActive: boolean;
+    /** Matrix SDK keeps a redacted branch in state as an inactive object. */
+    readonly isActive?: boolean;
     getName(): string;
     setName(name: string): Promise<void>;
     delete(): Promise<void>;
@@ -37,10 +36,6 @@ export interface FileBranch {
         httpUrl: string;
     }>;
     getFileEvent(): Promise<Pick<MatrixEvent, "getContent" | "getTs" | "isDecryptionFailure">>;
-    getVersionHistory(): Promise<FileBranch[]>;
-    createNewVersion(name: string, encryptedContents: ArrayBuffer | Uint8Array, info: Record<string, unknown>, additionalContent?: Record<string, unknown>): Promise<{
-        event_id: string;
-    }>;
 }
 export interface CreateTeleCryptIOStorageOptions {
     /** Matrix homeserver base URL, e.g. "https://matrix.example.com". */

package/dist/core/operations.js

@@ -16,7 +16,6 @@ import { ClientPrefix } from "matrix-js-sdk/lib/http-api/prefix.js";
 import { Method } from "matrix-js-sdk/lib/http-api/method.js";
 import { FileTooLargeError, MutationPartialError, MutationOutcomeUnknownError, NonEmptyTreeError, RoomCreationAmbiguousError, RoomCleanupIncompleteError, StorageError, } from "./errors.js";
 import { ConditionTimeoutError, waitForCondition } from "./poll.js";
-import { validateMatrixEventId } from "./constants.js";
 import { validateName } from "./validation.js";
 import { getDeletedTreeIds, isFileDeleted, isTreeDeleted, markFileDeleted, markTreeDeleted, } from "../deletion-markers.js";
 /**
@@ -206,20 +205,17 @@ async function resolveFile(storage, tree, fileId, signal) {
     }
 }
 /**
- * Deleting a tree is deliberately a one-room operation.  File versions are
- * physical Matrix media events, so callers must delete files explicitly and
- * observe each result before removing their containing room.  This also
- * prevents a folder/vault delete from silently deleting a nested shared tree.
+ * Deleting a tree is deliberately a one-room operation. Callers must delete
+ * files explicitly and observe each result before removing their containing
+ * room. This also prevents a folder/vault delete from silently deleting a
+ * nested shared tree.
  */
 function assertTreeEmptyForDeletion(storage, tree, spaces) {
     if (spaces.length !== 1)
         throw new NonEmptyTreeError(tree.id);
     let files;
     try {
-        files = tree
-            .listAllFiles()
-            .filter((file) => !isMarkedFileDeleted(storage, tree.id, file.id) &&
-            !isConfirmedDeletedFile(storage.getClient(), tree.id, file));
+        files = tree.listFiles().filter((file) => !isMarkedFileDeleted(storage, tree.id, file.id));
     }
     catch (error) {
         throw new StorageError("could not enumerate storage files safely", { cause: error });
@@ -336,26 +332,6 @@ function snapshotTreeSpaces(root, activeRelationClient) {
     }
     return spaces;
 }
-/**
- * A deleted MSC3089 branch is represented by an authoritative empty state
- * event. Inactive branches with metadata are historical versions, and a
- * missing or malformed state cannot prove that the file was deleted.
- */
-function isConfirmedDeletedFile(client, treeId, file) {
-    if (file.isActive)
-        return false;
-    const stateEvents = readRelationEvents(client, treeId, UNSTABLE_MSC3089_BRANCH.name, file.id);
-    if (!stateEvents || stateEvents.length !== 1)
-        return false;
-    const stateEvent = stateEvents[0];
-    if (relationStateKey(stateEvent) !== file.id)
-        return false;
-    const content = stateEvent.getContent?.();
-    return (typeof content === "object" &&
-        content !== null &&
-        !Array.isArray(content) &&
-        Object.keys(content).length === 0);
-}
 /**
  * Deletion is intentionally narrower than MSC3089TreeSpace.delete(): a local
  * child graph is not proof that the rooms are exclusively owned by this tree.
@@ -1194,61 +1170,6 @@ export async function renameFile(storage, treeId, fileId, name, options) {
         return { id: fileId, name };
     }, "mutation");
 }
-/**
- * Resolve the complete encrypted version chain before mutating Matrix.
- *
- * matrix-js-sdk returns the active version first and older versions after it.
- * Treat a repeated event ID as a cycle/invalid relation graph, and bound both
- * the event walk and the media identifiers sent to Synapse. Resolving every
- * media URL first is important: a decryption or relation failure must not leave
- * a partially deleted file chain.
- */
-async function resolveFileVersions(branch, signal) {
-    let history;
-    try {
-        history = await branch.getVersionHistory();
-    }
-    catch (error) {
-        throw new StorageError("could not resolve file version history safely", { cause: error });
-    }
-    if (!Array.isArray(history) || history.length === 0) {
-        throw new StorageError("file version history is invalid");
-    }
-    const eventIds = new Set();
-    const mediaIds = new Set();
-    const versions = [];
-    for (const version of history) {
-        if (signal?.aborted)
-            throw new StorageError("operation cancelled");
-        if (!version || typeof version.id !== "string") {
-            throw new StorageError("file version history is invalid");
-        }
-        try {
-            validateMatrixEventId(version.id, "file version event ID");
-        }
-        catch (error) {
-            throw new StorageError("file version history contains an invalid event ID", { cause: error });
-        }
-        if (eventIds.has(version.id)) {
-            throw new StorageError("file version history contains a cycle");
-        }
-        eventIds.add(version.id);
-        let fileInfo;
-        try {
-            fileInfo = await version.getFileInfo();
-        }
-        catch (error) {
-            throw new StorageError("could not resolve encrypted file version safely", { cause: error });
-        }
-        const mediaId = fileInfo?.info?.url;
-        if (typeof mediaId !== "string" || mediaId.length === 0) {
-            throw new StorageError("encrypted file version has no media identifier");
-        }
-        mediaIds.add(mediaId);
-        versions.push({ branch: version, mediaId });
-    }
-    return versions;
-}
 function requireFileDeletionTransport(client) {
     const http = client.http;
     if (!http || typeof http.authedRequest !== "function") {
@@ -1274,19 +1195,26 @@ export async function deleteFile(storage, treeId, fileId, options) {
     return withOperationDeadline(options, async (signal) => {
         const tree = await resolveTree(storage, treeId, signal);
         const branch = await resolveFile(storage, tree, fileId, signal);
-        const versions = await resolveFileVersions(branch, signal);
-        const mediaIds = [...new Set(versions.map(({ mediaId }) => mediaId))];
-        await deleteFileMedia(storage, mediaIds, signal);
+        let fileInfo;
+        try {
+            fileInfo = await branch.getFileInfo();
+        }
+        catch (error) {
+            throw new StorageError("could not resolve encrypted file safely", { cause: error });
+        }
+        const mediaId = fileInfo?.info?.url;
+        if (typeof mediaId !== "string" || mediaId.length === 0) {
+            throw new StorageError("encrypted file has no media identifier");
+        }
+        await deleteFileMedia(storage, [mediaId], signal);
         const completedIds = [];
         try {
             const client = typeof storage.getClient === "function" ? storage.getClient() : undefined;
             if (!client)
                 throw new StorageError("Matrix client unavailable");
-            for (const { branch: version } of versions) {
-                await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.sendStateEvent(tree.id, UNSTABLE_MSC3089_BRANCH.name, {}, version.id), signal, "delete file state"), signal);
-                await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.redactEvent(tree.id, version.id), signal, "delete file event"), signal);
-                completedIds.push(version.id);
-            }
+            await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.sendStateEvent(tree.id, UNSTABLE_MSC3089_BRANCH.name, {}, branch.id), signal, "delete file state"), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.redactEvent(tree.id, branch.id), signal, "delete file event"), signal);
+            completedIds.push(branch.id);
         }
         catch (error) {
             if (error instanceof MutationOutcomeUnknownError)
@@ -1301,18 +1229,19 @@ export async function deleteFile(storage, treeId, fileId, options) {
                 await storage.refreshRoomState(tree.id, { signal });
                 ensureOperationActive(signal);
                 const current = tree.getFile(fileId);
-                return !current || !current.isActive ? true : null;
+                // Matrix SDK keeps a redacted branch event in room state as an
+                // inactive branch. Treat both an absent branch and that redacted
+                // inactive branch as confirmed deletion.
+                return !current || current.isActive === false ? true : null;
             }, { timeoutMs: 15000, signal });
         }
         catch (error) {
             if (error instanceof MutationOutcomeUnknownError)
                 throw error;
-            const detail = "Matrix deletion completed but the inactive file state could not be verified";
+            const detail = "Matrix deletion completed but the file state could not be verified";
             throw new MutationPartialError("delete file", completedIds, detail, { cause: error });
         }
-        for (const { branch: version } of versions) {
-            markFileDeleted(storage.getClient(), tree.id, version.id);
-        }
+        markFileDeleted(storage.getClient(), tree.id, branch.id);
         ensureOperationActive(signal);
         return { id: fileId, deleted: true };
     }, "mutation");
@@ -1340,7 +1269,7 @@ export async function uploadFile(storage, treeId, name, bytes, mimetype, options
                 await storage.refreshRoomState(tree.id, { signal });
                 ensureOperationActive(signal);
                 const file = tree.getFile(fileId);
-                return file?.isActive ? file : null;
+                return file ?? null;
             }, { timeoutMs: 15000, signal });
         }
         catch (error) {

package/package.json

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