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

package/dist/lib/client/SecrecyAppClient.js

@@ -79,12 +79,15 @@ export class SecrecyAppClient {
     async userPublicKey(input, appId) {
         appId ??= this.appId;
         const userIds = Array.isArray(input) ? input : [input];
+        if (userIds.length === 0) {
+            return {};
+        }
         const publicKeys = Object.fromEntries(userIds
             .map((userId) => [
             userId,
             publicKeysCache.get(`userPublicKey:${userId}-${appId}`),
         ])
-            .filter(([_, key]) => !!key));
+            .filter(([_, key]) => key !== undefined));
         const missingKeys = [
             ...new Set(userIds.filter((userId) => publicKeys[userId] === undefined)),
         ];

package/dist/lib/client/SecrecyCloudClient.js

@@ -38,7 +38,7 @@ export class SecrecyCloudClient {
             const shares = users.map(([user]) => {
                 const publicKey = userKeys[user.id];
                 if (!publicKey) {
-                    throw new Error('Unable to retreive share by public key!');
+                    throw new Error('Unable to retrieve share by public key!');
                 }
                 return {
                     id: user.id,
@@ -345,10 +345,14 @@ export class SecrecyCloudClient {
             : [nodesMap];
         const details = await chunks.reduce(async (pendingState, nodesMap, index) => {
             const state = await pendingState;
-            const nodesToEncrypt = Object.fromEntries(Object.entries(nodesMap).map(([key, value]) => [
-                key,
-                value.filter((node) => node.includeKeys).map((node) => node.nodeId),
-            ]));
+            const nodesToEncrypt = Object.fromEntries(Object.entries(nodesMap)
+                .map(([userId, value]) => {
+                const filtered = value
+                    .filter((node) => node.includeKeys)
+                    .map((node) => node.nodeId);
+                return filtered.length > 0 ? [userId, filtered] : null;
+            })
+                .filter((entry) => entry !== null));
             const infos = await this.encryptNodesForUsers(nodesToEncrypt, publicKeysMap);
             const shares = Array.isArray(input)
                 ? input
@@ -401,9 +405,9 @@ export class SecrecyCloudClient {
             for (const [userId, nodes] of Object.entries(withKeys)) {
                 finishInput.push({
                     userId,
-                    rights: nodes.rights,
                     nodes: nodes.nodes.map((node) => ({
                         id: node.id,
+                        rights: nodes.rights,
                         nameKey: node.nameKey,
                         data: node.data.map((d) => ({
                             id: d.id,
@@ -415,11 +419,10 @@ export class SecrecyCloudClient {
             for (const [userId, nodes] of Object.entries(nodesToUpdateRights)) {
                 finishInput.push(...nodes.map((node) => ({
                     userId,
-                    rights: node.rights,
                     nodes: [
                         {
                             id: node.nodeId,
-                            nameKey: null,
+                            rights: node.rights,
                             data: [],
                         },
                     ],
@@ -664,14 +667,17 @@ export class SecrecyCloudClient {
     userPublicKeys) => {
         const userIds = Object.keys(userNodes).map((userId) => userId);
         const nodeIds = Object.values(userNodes).flatMap((nodeIds) => nodeIds);
+        if (nodeIds.length === 0) {
+            return {};
+        }
         const nodes = [];
         // Pre check to ensure we get all public keys for users!
         for (const userId of userIds) {
             if (userPublicKeys[userId] === undefined) {
-                throw new Error(`Unable to retreive some user public keys!`);
+                throw new Error(`Unable to retrieve some user public keys!`);
             }
         }
-        // Retreive and format nodes.
+        // Retrieve and format nodes.
         for (const nodeId of nodeIds) {
             let node;
             node ??= nodesEncryptionCache.get(nodeId);
@@ -687,14 +693,14 @@ export class SecrecyCloudClient {
                     access: { nameKey: node.access.nameKey },
                     history: node.history.map((data) => {
                         if (!data.key) {
-                            throw new Error('Unable to retreive data key!');
+                            throw new Error('Unable to retrieve data key!');
                         }
                         return { id: data.id, key: data.key };
                     }),
                 });
             }
         }
-        // Retreive all missing nodes from cache to api.
+        // Retrieve all missing nodes from cache to api.
         const missingNodeIds = nodeIds.filter((nodeId) => !nodes.some((node) => node.id === nodeId));
         const fetchedNodes = await this.#apiClient.cloud.nodesForEncryption.query({
             ids: missingNodeIds,
@@ -713,7 +719,7 @@ export class SecrecyCloudClient {
             for (const nodeId of userNodes[userId]) {
                 const node = nodes.find((node) => node.id === nodeId);
                 if (!node) {
-                    throw new Error('Unable to retreive node from ram');
+                    throw new Error('Unable to retrieve node from ram');
                 }
                 if (node.type === 'FILE' &&
                     (!('history' in node) || node.history.length === 0)) {

package/dist/types/client.d.ts

@@ -4144,26 +4144,26 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => {
                 _ctx_out: {};
                 _input_in: {
                     userId: string;
-                    rights: "admin" | "write" | "read";
                     nodes: {
                         data: {
                             id: string;
-                            key: string | null;
+                            key?: string | null | undefined;
                         }[];
                         id: string;
-                        nameKey: string | null;
+                        rights: "admin" | "write" | "read";
+                        nameKey?: string | null | undefined;
                     }[];
                 }[];
                 _input_out: {
                     userId: string;
-                    rights: "admin" | "write" | "read";
                     nodes: {
                         data: {
                             id: string;
-                            key: string | null;
+                            key?: string | null | undefined;
                         }[];
                         id: string;
-                        nameKey: string | null;
+                        rights: "admin" | "write" | "read";
+                        nameKey?: string | null | undefined;
                     }[];
                 }[];
                 _output_in: {
@@ -5818,26 +5818,26 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => {
                 _ctx_out: {};
                 _input_in: {
                     userId: string;
-                    rights: "admin" | "write" | "read";
                     nodes: {
                         data: {
                             id: string;
-                            key: string | null;
+                            key?: string | null | undefined;
                         }[];
                         id: string;
-                        nameKey: string | null;
+                        rights: "admin" | "write" | "read";
+                        nameKey?: string | null | undefined;
                     }[];
                 }[];
                 _input_out: {
                     userId: string;
-                    rights: "admin" | "write" | "read";
                     nodes: {
                         data: {
                             id: string;
-                            key: string | null;
+                            key?: string | null | undefined;
                         }[];
                         id: string;
-                        nameKey: string | null;
+                        rights: "admin" | "write" | "read";
+                        nameKey?: string | null | undefined;
                     }[];
                 }[];
                 _output_in: {

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.10",
+  "version": "1.62.0-feat-node-sharing.12",
   "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.20",
+    "@secrecy/trpc-api-types": "1.33.0-feat-share-node-enhanced.23",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "@types/libsodium-wrappers-sumo": "^0.7.8",