@secrecy/lib 1.75.0-feat-groups-identity.3 → 1.75.0-feat-groups-identity.5

package/dist/lib/cache.js

@@ -3,6 +3,15 @@ import { gigaToBytes } from './utils.js';
 export const dataCache = new Map();
 export const nodesCache = new Map();
 export const nodesEncryptionCache = new Map();
+export const getNodeForEncryptionFromCache = (id) => {
+    if (nodesEncryptionCache.has(id)) {
+        return nodesEncryptionCache.get(id);
+    }
+    if (nodesCache.has(id)) {
+        return nodesCache.get(id);
+    }
+    return undefined;
+};
 export const usersCache = new Map();
 export const publicKeysCache = new Map();
 export const dataContentCache = new LRUCache({

package/dist/lib/client/SecrecyAppClient.js

@@ -88,22 +88,35 @@ export class SecrecyAppClient {
             ...new Set(userIds.filter((userId) => publicKeys[userId] === undefined)),
         ];
         if (missingKeys.length > 0) {
-            const userKeysMap = await this.#client.apiClient.application.userPublicKey.query({
-                userIds: missingKeys,
-                appId,
-            });
-            if ('publicKey' in userKeysMap) {
-                throw Error('Should not happen!');
+            if (missingKeys.length === 1) {
+                const userKey = await this.#client.apiClient.application.userPublicKey.query({
+                    id: missingKeys[0],
+                    appId,
+                });
+                if (userKey.appId !== appId) {
+                    throw new Error(`AppId mismatch: ${userKey.appId} !== ${appId}`);
+                }
+                publicKeys[missingKeys[0]] = userKey.publicKey;
+                publicKeysCache.set(`userPublicKey:${missingKeys[0]}-${appId}`, userKey.publicKey);
             }
-            if (userKeysMap.appId !== appId) {
-                throw new Error(`AppId mismatch: ${userKeysMap.appId} !== ${appId}`);
-            }
-            if (Object.keys(userKeysMap.publicKeys).length !== missingKeys.length) {
-                throw new Error("Unable to load some user's public keys!");
-            }
-            for (const [userId, userPublicKey] of Object.entries(userKeysMap.publicKeys)) {
-                publicKeys[userId] = userPublicKey;
-                publicKeysCache.set(`userPublicKey:${userId}-${appId}`, userPublicKey);
+            else {
+                const userKeysMap = await this.#client.apiClient.application.usersPublicKey.query({
+                    userIds: missingKeys,
+                    appId,
+                });
+                if ('publicKey' in userKeysMap) {
+                    throw Error('Should not happen!');
+                }
+                if (userKeysMap.appId !== appId) {
+                    throw new Error(`AppId mismatch: ${userKeysMap.appId} !== ${appId}`);
+                }
+                if (Object.keys(userKeysMap.publicKeys).length !== missingKeys.length) {
+                    throw new Error("Unable to load some user's public keys!");
+                }
+                for (const [userId, userPublicKey] of Object.entries(userKeysMap.publicKeys)) {
+                    publicKeys[userId] = userPublicKey;
+                    publicKeysCache.set(`userPublicKey:${userId}-${appId}`, userPublicKey);
+                }
             }
         }
         return Array.isArray(input) ? publicKeys : publicKeys[input];

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,4 +1,4 @@
-import { nodesCache, dataCache, dataContentCache, nodesEncryptionCache, } from '../cache.js';
+import { nodesCache, dataCache, dataContentCache, getNodeForEncryptionFromCache, } from '../cache.js';
 import { decryptCryptoBox, encryptCryptoBox } from '../crypto/index.js';
 import { decompress } from '../minify/index.js';
 import { sodium } from '../sodium.js';
@@ -470,16 +470,23 @@ export class SecrecyCloudClient {
         const nodes = [];
         // Retrieve and format nodes.
         for (const nodeId of nodeIds) {
-            let node = nodesEncryptionCache.get(nodeId) ?? nodesCache.get(nodeId);
-            if (node &&
-                'history' in node &&
-                node.history.length > 0 &&
-                node.access.nameKey) {
+            const node = getNodeForEncryptionFromCache(nodeId);
+            // ! Only keep nodes FILE with history.
+            if (node && 'history' in node && node.history.length > 0) {
+                const access = 'accesses' in node
+                    ? node.accesses.find((a) => a.nameKey !== null)
+                    : node.access;
+                if (!access) {
+                    throw new Error(`No access found for node ${node.id} to share!`);
+                }
+                if (access.nameKey === null) {
+                    throw new Error(`No nameKey found for node ${node.id} to share!`);
+                }
                 nodes.push({
                     id: nodeId,
                     name: node.name,
                     type: node.type,
-                    access: { nameKey: node.access.nameKey },
+                    access: { nameKey: access.nameKey },
                     history: node.history.map((data) => {
                         if (!data.key) {
                             throw new Error('Unable to retrieve data key!');
@@ -516,20 +523,13 @@ export class SecrecyCloudClient {
                     (!('history' in node) || node.history.length === 0)) {
                     throw new Error(`Can't share a node without data (${node.id})!`);
                 }
-                const nameKey = node.access?.nameKey;
                 nodesMappedUsers[pubKey].push({
                     id: node.id,
-                    nameKey: nameKey !== null
-                        ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(nameKey), pubKey, this.#client.uaPrivateKey))
-                        : null,
-                    data: 'history' in node
-                        ? node.history.map((f) => ({
-                            id: f.id,
-                            key: f.key
-                                ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), pubKey, this.#client.uaPrivateKey))
-                                : null,
-                        }))
-                        : [],
+                    nameKey: sodium.to_hex(encryptCryptoBox(sodium.from_hex(node.access.nameKey), pubKey, this.#client.uaPrivateKey)),
+                    data: node.history.map((f) => ({
+                        id: f.id,
+                        key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), pubKey, this.#client.uaPrivateKey)),
+                    })),
                 });
             }
         }

package/dist/types/cache.d.ts

@@ -1,8 +1,10 @@
 import type { InternalNode, InternalData, InternalNodeFull, LocalData, InternalMinimalNodeForEncryption } from './client/types/index.js';
 import { LRUCache } from 'lru-cache';
+type NodeForEncryptionCached = InternalNode | InternalNodeFull | InternalMinimalNodeForEncryption;
 export declare const dataCache: Map<string, InternalData>;
 export declare const nodesCache: Map<string, InternalNode | InternalNodeFull>;
 export declare const nodesEncryptionCache: Map<string, InternalMinimalNodeForEncryption>;
+export declare const getNodeForEncryptionFromCache: (id: string) => NodeForEncryptionCached | undefined;
 export declare const usersCache: Map<string, {
     firstname: string;
     lastname: string;
@@ -12,3 +14,4 @@ export declare const usersCache: Map<string, {
 }>;
 export declare const publicKeysCache: Map<string, string>;
 export declare const dataContentCache: LRUCache<string, LocalData, unknown>;
+export {};

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

@@ -67,10 +67,10 @@ export type ApiNodeParent = NonNullable<RouterOutputs['cloud']['nodeFullById']['
 export type NodeType = ApiNode['type'];
 export type EncryptedNodeInfos = {
     id: string;
-    nameKey: string | null;
+    nameKey: string;
     data: {
         id: string;
-        key: string | null;
+        key: string;
     }[];
 };
 export type ShareNodeDetails = {

package/dist/types/client.d.ts

@@ -244,6 +244,17 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
             meta: any;
         }>;
         userPublicKey: import("@trpc/server").TRPCQueryProcedure<{
+            input: {
+                id: string;
+                appId?: string | undefined;
+            };
+            output: {
+                appId: string;
+                publicKey: string;
+            };
+            meta: any;
+        }>;
+        usersPublicKey: import("@trpc/server").TRPCQueryProcedure<{
             input: {
                 userId: string;
                 appId?: string | undefined;
@@ -4976,9 +4987,10 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                     encPriv: string;
                     sharedByPubKey: string;
-                    groupOwnerPubKey: string;
+                    groupRole: "ADMIN" | "MEMBER";
                 })[];
             };
             meta: any;
@@ -5006,9 +5018,10 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                     encPriv: string;
                     sharedByPubKey: string;
-                    groupOwnerPubKey: string;
+                    groupRole: "ADMIN" | "MEMBER";
                 })[] | null;
             };
             meta: any;
@@ -5681,15 +5694,6 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
             };
             meta: any;
         }>;
-        publicKey: import("@trpc/server").TRPCQueryProcedure<{
-            input: {
-                id: string;
-            };
-            output: {
-                pub: string;
-            };
-            meta: any;
-        }>;
         self: import("@trpc/server").TRPCQueryProcedure<{
             input: {
                 t?: number | undefined;
@@ -5816,6 +5820,7 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                 };
             };
             meta: any;
@@ -5834,6 +5839,7 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                 })[];
             };
             meta: any;
@@ -5851,9 +5857,10 @@ export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => import
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                     encPriv: string;
                     sharedByPubKey: string;
-                    groupOwnerPubKey: string;
+                    groupRole: "ADMIN" | "MEMBER";
                 })[];
             };
             meta: any;
@@ -6097,6 +6104,17 @@ export declare const getTrpcGuestClient: ({ url }?: {
             meta: any;
         }>;
         userPublicKey: import("@trpc/server").TRPCQueryProcedure<{
+            input: {
+                id: string;
+                appId?: string | undefined;
+            };
+            output: {
+                appId: string;
+                publicKey: string;
+            };
+            meta: any;
+        }>;
+        usersPublicKey: import("@trpc/server").TRPCQueryProcedure<{
             input: {
                 userId: string;
                 appId?: string | undefined;
@@ -10829,9 +10847,10 @@ export declare const getTrpcGuestClient: ({ url }?: {
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                     encPriv: string;
                     sharedByPubKey: string;
-                    groupOwnerPubKey: string;
+                    groupRole: "ADMIN" | "MEMBER";
                 })[];
             };
             meta: any;
@@ -10859,9 +10878,10 @@ export declare const getTrpcGuestClient: ({ url }?: {
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                     encPriv: string;
                     sharedByPubKey: string;
-                    groupOwnerPubKey: string;
+                    groupRole: "ADMIN" | "MEMBER";
                 })[] | null;
             };
             meta: any;
@@ -11534,15 +11554,6 @@ export declare const getTrpcGuestClient: ({ url }?: {
             };
             meta: any;
         }>;
-        publicKey: import("@trpc/server").TRPCQueryProcedure<{
-            input: {
-                id: string;
-            };
-            output: {
-                pub: string;
-            };
-            meta: any;
-        }>;
         self: import("@trpc/server").TRPCQueryProcedure<{
             input: {
                 t?: number | undefined;
@@ -11669,6 +11680,7 @@ export declare const getTrpcGuestClient: ({ url }?: {
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                 };
             };
             meta: any;
@@ -11687,6 +11699,7 @@ export declare const getTrpcGuestClient: ({ url }?: {
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                 })[];
             };
             meta: any;
@@ -11704,9 +11717,10 @@ export declare const getTrpcGuestClient: ({ url }?: {
                     kind: "GROUP";
                     identityPubKey: string;
                     groupId: string;
+                    groupOwnerPubKey: string;
                     encPriv: string;
                     sharedByPubKey: string;
-                    groupOwnerPubKey: string;
+                    groupRole: "ADMIN" | "MEMBER";
                 })[];
             };
             meta: any;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.75.0-feat-groups-identity.3",
+  "version": "1.75.0-feat-groups-identity.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"
@@ -76,7 +76,7 @@
   },
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
-    "@secrecy/trpc-api-types": "1.33.0-feat-groups-identity.22",
+    "@secrecy/trpc-api-types": "1.33.0-feat-groups-identity.25",
     "@trpc/client": "11.6.0",
     "@trpc/server": "^11.6.0",
     "@types/libsodium-wrappers-sumo": "^0.7.8",