@secrecy/lib 1.10.1 → 1.11.0

package/dist/lib/base-client.js

@@ -58,7 +58,7 @@ export class BaseClient {
     }
     async updateProfile(data) {
         const updateProfile = await this.client.user.updateProfile.mutate(data);
-        return updateProfile; // TODO
+        return updateProfile;
     }
     static async isCryptoTransactionDone({ idOrHash, network = 'mainnet', }) {
         const { isDone } = await this.getBaseClient().crypto.isTransactionDone.query({

package/dist/lib/cache.js

@@ -1,4 +1,13 @@
+import { LRUCache } from 'lru-cache';
+import { gigaToBytes } from './utils.js';
 export const filesCache = new Map();
 export const nodesCache = new Map();
 export const usersCache = new Map();
 export const publicKeysCache = new Map();
+export const dataCache = new LRUCache({
+    max: 500,
+    maxSize: gigaToBytes(0.5),
+    sizeCalculation: (value) => {
+        return value.byteLength;
+    },
+});

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,8 +1,8 @@
 import axios from 'axios';
 import ky from 'ky';
 import { encryptName } from '../index.js';
-import { nodesCache, filesCache } from '../cache.js';
-import { secretstreamKeygen } from '../crypto/file.js';
+import { nodesCache, filesCache, dataCache } from '../cache.js';
+import { secretStreamKeygen } from '../crypto/file.js';
 import { decryptCryptoBox, encryptCryptoBox } from '../crypto/index.js';
 import { compress, decompress } from '../minify/index.js';
 import { sodium } from '../sodium.js';
@@ -35,16 +35,19 @@ export class SecrecyCloudClient {
             await this.#apiClient.cloud.shareFileInHistory.mutate({
                 fileId: file.id,
                 nodeId,
-                users: users.map(([u]) => ({
-                    id: u.id,
-                    key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(file.key), this.#keys.publicKey, this.#keys.privateKey)),
+                users: await Promise.all(users.map(async ([u]) => {
+                    const userPubKey = await this.#client.app.userPublicKey(u.id);
+                    return {
+                        id: u.id,
+                        key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(file.key), userPubKey, this.#keys.privateKey)),
+                    };
                 })),
             });
         }
         return internalNodeFullToNodeFull(node);
     }
     async uploadFile({ file, encryptProgress, uploadProgress, signal, }) {
-        const fileKey = secretstreamKeygen();
+        const fileKey = secretStreamKeygen();
         const fileBuffer = file instanceof File ? new Uint8Array(await file.arrayBuffer()) : file;
         const compressed = compress(fileBuffer);
         const { data: encryptedFile, md5: md5File, md5Encrypted, } = await encrypt(fileKey, compressed, encryptProgress, signal);
@@ -118,16 +121,12 @@ export class SecrecyCloudClient {
                 signal,
             });
             await uploadPartEnded(chunk.md5, chunk.order);
-            // if ((e as any).response.status === 0) {
-            //   // TODO https://github.com/sindresorhus/ky/issues/305
-            // } else {
-            //   throw e;
-            // }
         };
         await promiseAllLimit(3, uploadFile.parts.map((p) => async () => {
             await byPart(p);
         }));
         await uploadEnded();
+        dataCache.set(uploadFile.fileId, fileBuffer);
         return uploadFile.fileId;
     }
     async uploadFileInCloud({ file, name, nodeId, encryptProgress, uploadProgress, signal, }) {
@@ -194,7 +193,7 @@ export class SecrecyCloudClient {
         return isDeleted;
     }
     async createFolder({ name, parentFolderId, }) {
-        const key = secretstreamKeygen();
+        const key = secretStreamKeygen();
         const encryptedName = await encryptName(name, sodium.to_hex(key));
         const encryptedKey = encryptCryptoBox(key, this.#keys.publicKey, this.#keys.privateKey);
         const createFolder = await this.#apiClient.cloud.createFolder.mutate({
@@ -272,6 +271,10 @@ export class SecrecyCloudClient {
         return await apiNodeToExternalNodeFull(updateNode, this.#keys);
     }
     async fileContent({ fileId, onDownloadProgress, progressDecrypt, signal, }) {
+        const cached = dataCache.get(fileId);
+        if (cached !== undefined) {
+            return cached;
+        }
         const fileContent = await this.#apiClient.cloud.fileContentById.query({
             id: fileId,
         });
@@ -344,7 +347,9 @@ export class SecrecyCloudClient {
         if (encryptedContent === null) {
             throw `Can't find content for file ${fileId}`;
         }
-        return await finalize(encryptedContent);
+        const data = await finalize(encryptedContent);
+        dataCache.set(fileId, data);
+        return data;
     }
     async deleteFile({ fileId, nodeId, }) {
         const { isDeleted } = await this.#apiClient.cloud.deleteFile.mutate({
@@ -425,7 +430,7 @@ export class SecrecyCloudClient {
             key = file.key;
         }
         key = sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), this.#keys.publicKey, this.#keys.privateKey));
-        const nameKey = secretstreamKeygen();
+        const nameKey = secretStreamKeygen();
         const encryptedName = await encryptName(name, sodium.to_hex(nameKey));
         const encryptedNameKey = sodium.to_hex(encryptCryptoBox(nameKey, this.#keys.publicKey, this.#keys.privateKey));
         const saveInCloud = await this.#apiClient.cloud.saveInCloud.mutate({

package/dist/lib/client/SecrecyMailClient.js

@@ -123,7 +123,7 @@ export class SecrecyMailClient {
             return false;
         }
         const temporaryRecipients = new Array();
-        const recipients = new Array(); // TODO
+        const recipients = new Array();
         for (const { email } of draft.temporaryRecipients) {
             if (email === undefined) {
                 continue;
@@ -154,7 +154,7 @@ export class SecrecyMailClient {
         return isSent;
     }
     async sendWaitingEmails() {
-        // TODO opti this
+        // TODO optimize this
         const mails = await this.sentMails();
         const filtered = mails.filter((m) => m.temporaryRecipients.length > 0);
         for (const mail of filtered) {
@@ -196,8 +196,7 @@ export class SecrecyMailClient {
             });
         }
         const createDraftMail = await this.#apiClient.mail.createDraft.mutate({
-            // recipients: recipientsIds,
-            recipients, // TODO
+            recipients,
             replyToId,
             body: sodium.to_hex(encryptCryptoBox(sodium.from_string(body), this.#keys.publicKey, this.#keys.privateKey)),
             subject: sodium.to_hex(encryptCryptoBox(sodium.from_string(subject), this.#keys.publicKey, this.#keys.privateKey)),

package/dist/lib/client/convert/node.js

@@ -1,7 +1,7 @@
 import { sodium } from '../../sodium.js';
 import { decryptCryptoBox } from '../../crypto/index.js';
 import { nodesCache } from '../../cache.js';
-import { decryptSecretstream } from '../../crypto/file.js';
+import { decryptSecretStream } from '../../crypto/file.js';
 import { apiFileToInternal, internalFileToFile } from './file.js';
 export async function apiNodeToInternal(apiNode, keyPair) {
     const internal = {
@@ -28,7 +28,7 @@ export async function apiNodeToInternal(apiNode, keyPair) {
     internal.access = { ...apiNode.access };
     if (apiNode.access.nameKey !== null) {
         const key = decryptCryptoBox(sodium.from_hex(apiNode.access.nameKey), apiNode.access.sharedByPubKey, keyPair.privateKey);
-        internal.name = sodium.to_string(await decryptSecretstream(key, sodium.from_hex(internal.name)));
+        internal.name = sodium.to_string(await decryptSecretStream(key, sodium.from_hex(internal.name)));
         internal.access.nameKey = sodium.to_hex(key);
     }
     for (const b of internal.breadcrumb) {
@@ -37,7 +37,7 @@ export async function apiNodeToInternal(apiNode, keyPair) {
         }
         const key = decryptCryptoBox(sodium.from_hex(b.nameKey), b.pubKey, keyPair.privateKey);
         b.nameKey = sodium.to_hex(key);
-        b.name = sodium.to_string(await decryptSecretstream(key, sodium.from_hex(b.name)));
+        b.name = sodium.to_string(await decryptSecretStream(key, sodium.from_hex(b.name)));
     }
     nodesCache.set(internal.id, internal);
     return internal;

package/dist/lib/client/index.js

@@ -1,5 +1,5 @@
 import { BaseClient } from '../base-client.js';
-import { encryptSecretstream } from '../crypto/file.js';
+import { encryptSecretStream } from '../crypto/file.js';
 import { sodium } from '../sodium.js';
 import { SecrecyCloudClient } from './SecrecyCloudClient.js';
 import { SecrecyMailClient } from './SecrecyMailClient.js';
@@ -11,7 +11,7 @@ import { SecrecyPayClient } from './SecrecyPayClient.js';
 import { SecrecyUserClient } from './SecrecyUserClient.js';
 import { SecrecyCareClient } from './SecrecryCareClient.js';
 export const encryptName = async (name, nameKey) => {
-    const { data } = await encryptSecretstream(sodium.from_hex(nameKey), sodium.from_string(name));
+    const { data } = await encryptSecretStream(sodium.from_hex(nameKey), sodium.from_string(name));
     const nameEncrypted = sodium.to_hex(data);
     return nameEncrypted;
 };

package/dist/lib/crypto/file.js

@@ -6,7 +6,7 @@ function assert(c, message) {
         throw new Error(message);
     }
 }
-export function secretstreamKeygen() {
+export function secretStreamKeygen() {
     return sodium.crypto_secretstream_xchacha20poly1305_keygen();
 }
 function encrypt(key) {
@@ -46,7 +46,7 @@ function decrypt(header, key) {
     };
 }
 export const CHUNK_SIZE = 8192;
-export async function encryptSecretstream(key, data, progress, abort) {
+export async function encryptSecretStream(key, data, progress, abort) {
     await setup();
     const { encrypt: crypt, destroy, header } = encrypt(key);
     const encryptedChunk = CHUNK_SIZE + sodium.crypto_secretstream_xchacha20poly1305_ABYTES;
@@ -102,11 +102,11 @@ export async function encryptSecretstream(key, data, progress, abort) {
         md5: spark.end(),
     };
 }
-export async function decryptSecretstream(key, data, progress, abort) {
+export async function decryptSecretStream(key, data, progress, abort) {
     await setup();
     const header = data.slice(0, sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES);
     data = data.slice(sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES);
-    const { decrypt: decryptt, destroy } = decrypt(header, key);
+    const { decrypt: decryptFn, destroy } = decrypt(header, key);
     const chunkSize = CHUNK_SIZE + sodium.crypto_secretstream_xchacha20poly1305_ABYTES;
     const max = Math.ceil(data.byteLength / chunkSize) * CHUNK_SIZE;
     void progress?.({
@@ -121,9 +121,9 @@ export async function decryptSecretstream(key, data, progress, abort) {
         if (abort?.signal.aborted === true) {
             throw new Error(`Decrypt aborted`);
         }
-        const tmp = decryptt(chunk);
-        final.set(tmp.message, total);
-        total += tmp.message.byteLength;
+        const messageTag = decryptFn(chunk);
+        final.set(messageTag.message, total);
+        total += messageTag.message.byteLength;
         const percent = total / max;
         if (percent > lastPercent + 0.01) {
             void progress?.({
@@ -142,13 +142,13 @@ export async function decryptSecretstream(key, data, progress, abort) {
     });
     return final.slice(0, total);
 }
-// async function mainSecretstream(random: Uint8Array): Promise<vo id> {
+// async function mainSecretStream(random: Uint8Array): Promise<vo id> {
 //   const key = secretstreamKeygen();
 //   console.time("secretstream_encrypt");
-//   const crypted = en cryptSecretstream(key, random);
+//   const crypted = en cryptSecretStream(key, random);
 //   consol e.timeEnd("secretstream_encrypt");
 //   console.time("secretstream_decrypt");
-//   const decrypted =  decryptSecretstream(key, crypted);
+//   const decrypted =  decryptSecretStream(key, crypted);
 //   con sole.timeEnd("secretstream_decrypt");
 //   const first = t o_hex(random).slice(0, 32);
 //   const final = to_hex(decrypted).slice(0, 32);
@@ -158,7 +158,7 @@ export async function decryptSecretstream(key, data, progress, abort) {
 //     equals: firs t === final
 //   }) ;
 // }
-// async function mai nSecretbox(random: Uint8Array): Promise< void> {
+// async function mainSecretBox(random: Uint8Array): Promise< void> {
 //   const key = generateSecretBox();
 //   console.time("secretbox _encrypt");
 //   const crypted = encryptFile(random, key);
@@ -179,6 +179,6 @@ export async function decryptSecretstream(key, data, progress, abort) {
 //   console.time("randombytes_buf");
 //   const random = randombytes_buf(1_000_000 * 1024);
 //   consol e.timeEnd("randombytes_buf");
-//   await Promise.all([m ainSecretstream(random), mainSecretbox(random)]);
+//   await Promise.all([mainSecretStream(random), mainSecretBox(random)]);
 // }
 // main();

package/dist/lib/index.js

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/triple-slash-reference */
-/// <reference lib="dom" />
-/// <reference lib="dom.iterable" />
 export * from './client/index.js';
 export * from './crypto/index.js';
 export { BaseClient } from './base-client.js';

package/dist/lib/utils.js

@@ -0,0 +1,2 @@
+export const kiloToBytes = (kb) => kb * 1024;
+export const gigaToBytes = (gb) => gb * 2 ** 30;

package/dist/types/base-client.d.ts

@@ -12,7 +12,7 @@ export declare class BaseClient {
     static getUser(userId: string, sessionId?: string | null | undefined): Promise<PublicUser>;
     getUser(userId: string): Promise<PublicUser>;
     searchUsers(search: string): Promise<PublicUser[]>;
-    updateProfile(data: RouterInputs['user']['updateProfile']): Promise<SelfUser>;
+    updateProfile(data: RouterInputs['user']['updateProfile']): Promise<Omit<SelfUser, 'account'>>;
     static isCryptoTransactionDone({ idOrHash, network, }: {
         idOrHash: string;
         network?: InfuraNetwork;

package/dist/types/cache.d.ts

@@ -1,4 +1,5 @@
 import type { InternalNode, InternalFile, InternalNodeFull } from './client/types/index.js';
+import { LRUCache } from 'lru-cache';
 export declare const filesCache: Map<string, InternalFile>;
 export declare const nodesCache: Map<string, InternalNode | InternalNodeFull>;
 export declare const usersCache: Map<string, {
@@ -9,3 +10,4 @@ export declare const usersCache: Map<string, {
     isSearchable: boolean;
 }>;
 export declare const publicKeysCache: Map<string, string>;
+export declare const dataCache: LRUCache<string, Uint8Array, unknown>;

package/dist/types/crypto/file.d.ts

@@ -3,12 +3,12 @@ export interface EncryptedFile {
     md5: string;
     md5Encrypted: string;
 }
-export declare function secretstreamKeygen(): Uint8Array;
+export declare function secretStreamKeygen(): Uint8Array;
 export declare const CHUNK_SIZE = 8192;
 export interface Progress {
     percent: number;
     total: number;
     current: number;
 }
-export declare function encryptSecretstream(key: Uint8Array, data: Uint8Array, progress?: (progress: Progress) => Promise<void>, abort?: AbortController): Promise<EncryptedFile>;
-export declare function decryptSecretstream(key: Uint8Array, data: Uint8Array, progress?: (progress: Progress) => Promise<void>, abort?: AbortController): Promise<Uint8Array>;
+export declare function encryptSecretStream(key: Uint8Array, data: Uint8Array, progress?: (progress: Progress) => Promise<void>, abort?: AbortController): Promise<EncryptedFile>;
+export declare function decryptSecretStream(key: Uint8Array, data: Uint8Array, progress?: (progress: Progress) => Promise<void>, abort?: AbortController): Promise<Uint8Array>;

package/dist/types/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference lib="dom" />
-/// <reference lib="dom.iterable" />
 export * from './client/index.js';
 export * from './crypto/index.js';
 export type { Progress } from './crypto/file.js';

package/dist/types/utils.d.ts

@@ -0,0 +1,2 @@
+export declare const kiloToBytes: (kb: number) => number;
+export declare const gigaToBytes: (gb: number) => number;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"
@@ -84,6 +84,7 @@
     "jsonwebtoken": "^9.0.2",
     "ky": "^1.2.3",
     "libsodium-wrappers-sumo": "^0.7.13",
+    "lru-cache": "^10.2.0",
     "spark-md5": "^3.0.2",
     "superjson": "2.2.1",
     "zod": "3.22.4"