@secrecy/lib 1.62.0-feat-node-sharing.8 → 1.62.0-feat-node-sharing.10

package/dist/lib/client/SecrecyCloudClient.js

@@ -305,10 +305,11 @@ export class SecrecyCloudClient {
         const users = folder.parent?.users?.filter(([u]) => u.id !== this.#client.app.userId) ??
             [];
         if (users.length > 0) {
-            await this.shareNode({
+            await this.shareNode(users.map(([user, rights]) => ({
+                userId: user.id,
+                rights,
                 nodeId: folder.id,
-                users: users.map(([user, rights]) => ({ id: user.id, rights })),
-            });
+            })));
         }
         return folder;
     }
@@ -326,44 +327,110 @@ export class SecrecyCloudClient {
         return apiDataToExternal(data, this.#keys);
     }
     async shareNode(input, progress) {
-        const userIds = 'rights' in input
-            ? Array.isArray(input.nodes)
-                ? input.nodes.map(({ userId }) => userId)
-                : 'userIds' in input.nodes
-                    ? input.nodes.userIds
-                    : [input.nodes.userId]
-            : input.users.map(({ id }) => id);
-        const [publicKeysMap, nodesIdsMap] = await Promise.all([
-            this.#client.app.userPublicKey(userIds),
-            this.#apiClient.cloud.shareNode.mutate('nodes' in input
-                ? input.nodes
-                : {
-                    nodeId: input.nodeId,
-                    userIds: input.users.map(({ id }) => id),
-                }),
-        ]);
+        // TODO: Validate input
+        const nodesMap = await this.#apiClient.cloud.shareNode.mutate(input);
+        const neededUserKey = Object.entries(nodesMap)
+            .filter(([, nodes]) => nodes.some((node) => node.includeKeys))
+            .map(([userId]) => userId);
+        const publicKeysMap = await this.#client.app.userPublicKey(neededUserKey);
         const maxNodesBatchSize = 1000;
-        const totalNodesToShare = Object.values(nodesIdsMap).reduce((size, ids) => size + ids.length, 0);
+        const totalNodesToShare = Object.values(nodesMap).reduce((size, ids) => size + ids.length, 0);
+        progress?.({
+            total: totalNodesToShare,
+            current: 0,
+            percent: 0,
+        });
         const chunks = totalNodesToShare > maxNodesBatchSize
-            ? chunkByTotalItems(nodesIdsMap, maxNodesBatchSize)
-            : [nodesIdsMap];
+            ? chunkByTotalItems(nodesMap, maxNodesBatchSize)
+            : [nodesMap];
         const details = await chunks.reduce(async (pendingState, nodesMap, index) => {
             const state = await pendingState;
-            const infos = await this.encryptNodesForUsers(nodesMap, publicKeysMap);
-            const subState = await this.#apiClient.cloud.shareNodeFinish.mutate(Object.entries(infos).map('rights' in input
-                ? ([userId, nodes]) => ({ userId, nodes, rights: input.rights })
+            const nodesToEncrypt = Object.fromEntries(Object.entries(nodesMap).map(([key, value]) => [
+                key,
+                value.filter((node) => node.includeKeys).map((node) => node.nodeId),
+            ]));
+            const infos = await this.encryptNodesForUsers(nodesToEncrypt, publicKeysMap);
+            const shares = Array.isArray(input)
+                ? input
+                : 'userIds' in input
+                    ? 'nodeIds' in input
+                        ? input.userIds.flatMap((userId) => input.nodeIds.map((nodeId) => ({
+                            rights: input.rights,
+                            userId,
+                            nodeId,
+                        })))
+                        : input.userIds.map((userId) => ({
+                            rights: input.rights,
+                            userId,
+                            nodeId: input.nodeId,
+                        }))
+                    : input.nodeIds.map((nodeId) => ({
+                        rights: input.rights,
+                        nodeId,
+                        userId: input.userId,
+                    }));
+            const nodesToUpdateRights = Object.fromEntries(Object.entries(nodesMap).map(([userId, nodes]) => [
+                userId,
+                nodes
+                    .filter((node) => !node.includeKeys)
+                    .map((node) => {
+                    const share = shares.find((share) => share.nodeId === node.nodeId && share.userId === userId);
+                    if (!share) {
+                        throw new Error('Unable to retrieve rights!');
+                    }
+                    return {
+                        nodeId: node.nodeId,
+                        userId: userId,
+                        rights: share.rights,
+                    };
+                }),
+            ]));
+            const withKeys = Object.fromEntries(Object.entries(infos).map('rights' in input
+                ? ([userId, nodes]) => [
+                    userId,
+                    { userId, nodes, rights: input.rights },
+                ]
                 : ([userId, nodes]) => {
-                    const user = input.users.find((user) => user.id === userId);
-                    if (!user) {
-                        throw new Error(`Unable to find rights for user: ${userId}`);
+                    const share = shares.find((share) => share.userId === userId && share.nodeId === nodes[0].id);
+                    if (!share) {
+                        throw new Error('Unable to retrieve rights!');
                     }
-                    return { userId, nodes, rights: user.rights };
+                    return [userId, { userId, nodes, rights: share.rights }];
                 }));
+            const finishInput = [];
+            for (const [userId, nodes] of Object.entries(withKeys)) {
+                finishInput.push({
+                    userId,
+                    rights: nodes.rights,
+                    nodes: nodes.nodes.map((node) => ({
+                        id: node.id,
+                        nameKey: node.nameKey,
+                        data: node.data.map((d) => ({
+                            id: d.id,
+                            key: d.key,
+                        })),
+                    })),
+                });
+            }
+            for (const [userId, nodes] of Object.entries(nodesToUpdateRights)) {
+                finishInput.push(...nodes.map((node) => ({
+                    userId,
+                    rights: node.rights,
+                    nodes: [
+                        {
+                            id: node.nodeId,
+                            nameKey: null,
+                            data: [],
+                        },
+                    ],
+                })));
+            }
+            const subState = await this.#apiClient.cloud.shareNodeFinish.mutate(finishInput);
             const currentProgress = Math.min((index + 1) * maxNodesBatchSize, totalNodesToShare);
             progress?.({
                 total: totalNodesToShare,
                 current: currentProgress,
-                percent: Math.round((currentProgress / totalNodesToShare) * 100),
+                percent: currentProgress / totalNodesToShare,
             });
             return {
                 missingNodeAccesses: [
@@ -584,10 +651,11 @@ export class SecrecyCloudClient {
             const others = node.parent?.users.filter(([u]) => u.id !== this.#client.app.userId) ??
                 [];
             if (others.length > 0) {
-                await this.shareNode({
+                await this.shareNode(others.map(([user, rights]) => ({
+                    userId: user.id,
+                    rights,
                     nodeId: node.id,
-                    users: others.map(([user, rights]) => ({ id: user.id, rights })),
-                });
+                })));
             }
         }
         return node;

package/dist/types/client/SecrecyCloudClient.d.ts

@@ -1,5 +1,5 @@
 import type { ProgressCallback, SecrecyClient } from '../index.js';
-import type { DataMetadata, DataStorageType, KeyPair, LocalData, Node, NodeFull, NodeType, Rights } from './types/index.js';
+import type { DataMetadata, DataStorageType, KeyPair, LocalData, Node, NodeFull, NodeType } from './types/index.js';
 import { type RouterInputs, type ApiClient, type RouterOutputs } from '../client.js';
 import { type DownloadProgress } from '../types.js';
 import { FileTypeResult } from 'file-type';
@@ -54,28 +54,7 @@ export declare class SecrecyCloudClient {
     dataMetadata({ id }: {
         id: string;
     }): Promise<DataMetadata>;
-    shareNode(input: {
-        rights: Rights;
-        nodes: {
-            nodeId: string;
-            userId: string;
-        }[] | {
-            nodeId: string;
-            userIds: string[];
-        } | {
-            nodeIds: string[];
-            userId: string;
-        } | {
-            nodeIds: string[];
-            userIds: string[];
-        };
-    } | {
-        nodeId: string;
-        users: {
-            id: string;
-            rights: Rights;
-        }[];
-    }, progress?: ProgressCallback): Promise<RouterOutputs['cloud']['shareNodeFinish']>;
+    shareNode(input: RouterInputs['cloud']['shareNode'], progress?: ProgressCallback): Promise<RouterOutputs['cloud']['shareNodeFinish']>;
     updateNode({ nodeId, name, isFavorite, deletedAt, }: {
         nodeId: string;
         name?: string | null | undefined;

package/dist/types/client.d.ts

@@ -5912,32 +5912,46 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => {
                 _ctx_out: {};
                 _input_in: {
                     userId: string;
+                    rights: "admin" | "write" | "read";
                     nodeId: string;
                 }[] | {
+                    rights: "admin" | "write" | "read";
                     userIds: string[];
                     nodeIds: string[];
                 } | {
+                    rights: "admin" | "write" | "read";
                     nodeId: string;
                     userIds: string[];
                 } | {
                     userId: string;
+                    rights: "admin" | "write" | "read";
                     nodeIds: string[];
                 };
                 _input_out: {
                     userId: string;
+                    rights: "admin" | "write" | "read";
                     nodeId: string;
                 }[] | {
+                    rights: "admin" | "write" | "read";
                     userIds: string[];
                     nodeIds: string[];
                 } | {
+                    rights: "admin" | "write" | "read";
                     nodeId: string;
                     userIds: string[];
                 } | {
                     userId: string;
+                    rights: "admin" | "write" | "read";
                     nodeIds: string[];
                 };
-                _output_in: Record<string, string[]>;
-                _output_out: Record<string, string[]>;
+                _output_in: Record<string, {
+                    nodeId: string;
+                    includeKeys: boolean;
+                }[]>;
+                _output_out: Record<string, {
+                    nodeId: string;
+                    includeKeys: boolean;
+                }[]>;
             }, unknown>>;
         };
         updateNode: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.62.0-feat-node-sharing.8",
+  "version": "1.62.0-feat-node-sharing.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"
@@ -74,7 +74,7 @@
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "@secrecy/trpc-api-types": "1.33.0-feat-share-node-enhanced.16",
+    "@secrecy/trpc-api-types": "1.33.0-feat-share-node-enhanced.20",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "@types/libsodium-wrappers-sumo": "^0.7.8",