@telecrypt-io/storage 0.6.0 → 0.7.0

package/dist/core/operations.js

@@ -100,9 +100,7 @@ function isRateLimited(error) {
 function requiresMutationReconciliation(error) {
     return (error instanceof MutationOutcomeUnknownError ||
         error instanceof RoomCreationAmbiguousError ||
-        error instanceof RoomCleanupIncompleteError ||
-        (error instanceof Error &&
-            error.cleanupIncomplete === true));
+        error instanceof RoomCleanupIncompleteError);
 }
 async function withRateLimitRetry(operation, signal) {
     for (;;) {
@@ -175,13 +173,9 @@ async function resolveTree(storage, treeId, signal) {
     }
 }
 function isMarkedTreeDeleted(storage, treeId) {
-    if (typeof storage.getClient !== "function")
-        return false;
     return isTreeDeleted(storage.getClient(), treeId);
 }
 function isMarkedFileDeleted(storage, treeId, fileId) {
-    if (typeof storage.getClient !== "function")
-        return false;
     return isFileDeleted(storage.getClient(), treeId, fileId);
 }
 /** As `resolveTree`, but for a specific file within an already-resolved
@@ -417,10 +411,10 @@ async function unlinkExternalParents(storage, rootId, externalParents, signal) {
             // is not used here because it can be delayed or rejected independently of
             // the relation update.
             mutationAttempted = true;
-            await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.sendStateEvent(parentId, EventType.SpaceChild, {}, rootId), signal), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => client.sendStateEvent(parentId, EventType.SpaceChild, {}, rootId), signal), signal);
             if (signal?.aborted)
                 throw new StorageError("operation cancelled");
-            await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.sendStateEvent(rootId, EventType.SpaceParent, {}, parentId), signal), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => client.sendStateEvent(rootId, EventType.SpaceParent, {}, parentId), signal), signal);
             await storage.refreshRoomState(parentId, { signal });
             await storage.refreshRoomState(rootId, { signal });
             const childLink = readRelationEvents(client, parentId, EventType.SpaceChild, rootId);
@@ -461,8 +455,8 @@ async function relinkExternalParents(storage, rootId, externalParents, signal) {
     for (const parentId of externalParents) {
         if (signal?.aborted)
             throw new StorageError("operation cancelled");
-        await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.sendStateEvent(parentId, EventType.SpaceChild, { via: [via] }, rootId), signal), signal);
-        await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.sendStateEvent(rootId, EventType.SpaceParent, { via: [via] }, parentId), signal), signal);
+        await withRateLimitRetry(() => withMatrixMutationAbort(() => client.sendStateEvent(parentId, EventType.SpaceChild, { via: [via] }, rootId), signal), signal);
+        await withRateLimitRetry(() => withMatrixMutationAbort(() => client.sendStateEvent(rootId, EventType.SpaceParent, { via: [via] }, parentId), signal), signal);
         await storage.refreshRoomState(parentId, { signal });
         await storage.refreshRoomState(rootId, { signal });
         const childLink = readRelationEvents(client, parentId, EventType.SpaceChild, rootId);
@@ -503,7 +497,7 @@ async function deleteRoomDeterministically(storage, roomId, signal) {
                 continue;
             }
             try {
-                await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.kick(roomId, member.userId, "Room deleted"), signal), signal);
+                await withRateLimitRetry(() => withMatrixMutationAbort(() => client.kick(roomId, member.userId, "Room deleted"), signal), signal);
                 markRoomMutationComplete();
             }
             catch (error) {
@@ -523,7 +517,7 @@ async function deleteRoomDeterministically(storage, roomId, signal) {
         const ownMembership = await storage.getRoomMembership(roomId, undefined, { signal });
         if (ownMembership === "join" || ownMembership === "invite" || ownMembership === "knock") {
             try {
-                await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.leave(roomId), signal), signal);
+                await withRateLimitRetry(() => withMatrixMutationAbort(() => client.leave(roomId), signal), signal);
                 markRoomMutationComplete();
             }
             catch (error) {
@@ -532,7 +526,7 @@ async function deleteRoomDeterministically(storage, roomId, signal) {
             }
         }
         try {
-            await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.forget(roomId), signal), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => client.forget(roomId), signal), signal);
             markRoomMutationComplete();
         }
         catch (error) {
@@ -632,7 +626,7 @@ export async function joinVault(storage, vaultId, options) {
         if (membership === "join")
             return { vaultId, joined: true };
         try {
-            await withRateLimitRetry(() => withMatrixMutationAbort(storage.getClient(), () => storage.getClient().joinRoom(vaultId), signal), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => storage.getClient().joinRoom(vaultId), signal), signal);
         }
         catch (err) {
             if (err instanceof MutationOutcomeUnknownError)
@@ -765,7 +759,7 @@ export async function declineInvite(storage, vaultId, options) {
                 return { vaultId, declined: false };
             }
             try {
-                await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.leave(vaultId), signal), signal);
+                await withRateLimitRetry(() => withMatrixMutationAbort(() => client.leave(vaultId), signal), signal);
             }
             catch (error) {
                 let suppress = isGoneError(error);
@@ -777,7 +771,7 @@ export async function declineInvite(storage, vaultId, options) {
                     throw error;
             }
             try {
-                await withRateLimitRetry(() => withMatrixMutationAbort(client, () => client.forget(vaultId), signal), signal);
+                await withRateLimitRetry(() => withMatrixMutationAbort(() => client.forget(vaultId), signal), signal);
             }
             catch (error) {
                 let suppress = isGoneError(error);
@@ -815,7 +809,6 @@ export async function shareVault(storage, vaultId, userId, role, options) {
         ensureOperationActive(operation.signal);
         const tree = await resolveTree(storage, vaultId, operation.signal);
         const pending = withTreeMutation(storage.getClient(), async () => {
-            const client = storage.getClient();
             try {
                 ensureOperationActive(operation.signal);
                 await storage.refreshRoomState(tree.id, { signal: operation.signal });
@@ -839,7 +832,7 @@ export async function shareVault(storage, vaultId, userId, role, options) {
                     if (isActiveMembership(currentMembership ?? ""))
                         continue;
                     try {
-                        await withRateLimitRetry(() => withMatrixMutationAbort(client, () => space.invite(userId), operation.signal), operation.signal);
+                        await withRateLimitRetry(() => withMatrixMutationAbort(() => space.invite(userId), operation.signal), operation.signal);
                         completedRoomIds.add(space.id);
                     }
                     catch (error) {
@@ -863,7 +856,7 @@ export async function shareVault(storage, vaultId, userId, role, options) {
                     if (members.some((member) => member.userId === userId && member.role === "owner")) {
                         throw new StorageError("share will not demote an existing owner");
                     }
-                    await withRateLimitRetry(() => withMatrixMutationAbort(client, () => space.setPermissions(userId, role), operation.signal), operation.signal);
+                    await withRateLimitRetry(() => withMatrixMutationAbort(() => space.setPermissions(userId, role), operation.signal), operation.signal);
                     completedRoomIds.add(space.id);
                 }
             }
@@ -925,7 +918,7 @@ export async function unshareVault(storage, vaultId, userId, options) {
                     if (!isRevocableMembership(membership))
                         continue;
                     try {
-                        await withRateLimitRetry(() => withMatrixMutationAbort(storage.getClient(), () => storage.getClient().kick(space.id, userId, "unshared"), operation.signal), operation.signal);
+                        await withRateLimitRetry(() => withMatrixMutationAbort(() => storage.getClient().kick(space.id, userId, "unshared"), operation.signal), operation.signal);
                         completedRoomIds.add(space.id);
                     }
                     catch (error) {
@@ -1031,8 +1024,7 @@ async function renameTree(storage, treeId, name, options) {
     return withOperationDeadline(options, async (signal) => {
         const tree = await resolveTree(storage, treeId, signal);
         try {
-            const client = typeof storage.getClient === "function" ? storage.getClient() : undefined;
-            await withRateLimitRetry(() => client ? withMatrixMutationAbort(client, () => tree.setName(name), signal) : tree.setName(name), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => tree.setName(name), signal), signal);
             await waitForCondition(async () => {
                 ensureOperationActive(signal);
                 const current = storage.getTree(treeId);
@@ -1149,8 +1141,7 @@ export async function renameFile(storage, treeId, fileId, name, options) {
         const tree = await resolveTree(storage, treeId, signal);
         const branch = await resolveFile(storage, tree, fileId, signal);
         try {
-            const client = typeof storage.getClient === "function" ? storage.getClient() : undefined;
-            await withRateLimitRetry(() => client ? withMatrixMutationAbort(client, () => branch.setName(name), signal) : branch.setName(name), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => branch.setName(name), signal), signal);
             // `setName` resolves when the homeserver accepts the state event, but a
             // fresh CLI/UI process can still read the previous local room state for a
             // short time. Do not report success until this client has observed the new
@@ -1181,7 +1172,7 @@ async function deleteFileMedia(storage, mediaIds, signal) {
     const client = storage.getClient();
     const http = requireFileDeletionTransport(client);
     try {
-        await withRateLimitRetry(() => withMatrixMutationAbort(client, () => http.authedRequest(Method.Post, "/io.telecrypt.storage/delete_media", undefined, { media_ids: [...mediaIds] }, { prefix: ClientPrefix.Unstable, rawResponseBody: true, abortSignal: signal }), signal, "delete file media"), signal);
+        await withRateLimitRetry(() => withMatrixMutationAbort(() => http.authedRequest(Method.Post, "/io.telecrypt.storage/delete_media", undefined, { media_ids: [...mediaIds] }, { prefix: ClientPrefix.Unstable, rawResponseBody: true, abortSignal: signal }), signal, "delete file media"), signal);
     }
     catch (error) {
         if (error instanceof MutationOutcomeUnknownError)
@@ -1209,11 +1200,9 @@ export async function deleteFile(storage, treeId, fileId, options) {
         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");
-            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);
+            const client = storage.getClient();
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => client.sendStateEvent(tree.id, UNSTABLE_MSC3089_BRANCH.name, {}, branch.id), signal, "delete file state"), signal);
+            await withRateLimitRetry(() => withMatrixMutationAbort(() => client.redactEvent(tree.id, branch.id), signal, "delete file event"), signal);
             completedIds.push(branch.id);
         }
         catch (error) {
@@ -1229,7 +1218,10 @@ export async function deleteFile(storage, treeId, fileId, options) {
                 await storage.refreshRoomState(tree.id, { signal });
                 ensureOperationActive(signal);
                 const current = tree.getFile(fileId);
-                return !current ? 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telecrypt-io/storage",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "license": "BUSL-1.1",
   "type": "module",
   "packageManager": "npm@11.19.0",
@@ -25,12 +25,10 @@
     "node": "24.20.0"
   },
   "publishConfig": {
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "build": "tsc",
-    "typecheck:tests": "tsc -p tsconfig.test.json",
     "lint": "eslint src test --ext .ts",
     "test": "vitest run",
     "test:unit": "vitest run --config vitest.unit.config.ts",