@secrecy/lib 1.29.0-feat-rename-file.2 → 1.29.0-feat-upload-file-types.1

package/dist/lib/cache.js

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

package/dist/lib/client/SecrecyAppClient.js

@@ -82,8 +82,8 @@ export class SecrecyAppClient {
     async updateSettings(settings) {
         const updateAppSettings = await this.#apiClient.application.updateSettings.mutate({
             cloudNodeDaysForDelete: settings.cloudNodeDaysForDelete,
-            historyDataDaysForDelete: settings.historyDataDaysForDelete,
-            historyDataMaxCount: settings.historyDataMaxCount,
+            historyFileDaysForDelete: settings.historyFileDaysForDelete,
+            historyMaxFileCount: settings.historyMaxFileCount,
         });
         return updateAppSettings;
     }

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,15 +1,15 @@
 import axios from 'axios';
 import ky from 'ky';
 import { encryptName } from '../index.js';
-import { nodesCache, dataCache, lruCache } from '../cache.js';
-import { secretStreamKeygen } from '../crypto/data.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';
 import { enumerate, chunks, concatenate } from '../utils/array.js';
 import { md5 } from '../worker/md5.js';
 import { decrypt, encrypt } from '../worker/sodium.js';
-import { apiDataToExternal } from './convert/data.js';
+import { apiFileToExternal } from './convert/file.js';
 import { apiNodeFullToInternalFull, apiNodeToExternal, apiNodeToExternalNodeFull, internalNodeFullToNodeFull, } from './convert/node.js';
 import { promiseAllLimit } from '../utils/promise.js';
 // import { md5 } from "../worker/index.js";
@@ -23,71 +23,71 @@ export class SecrecyCloudClient {
         this.#keys = keys;
         this.#apiClient = apiClient;
     }
-    async addDataToHistory({ dataId, nodeId, }) {
-        const addDataToHistory = await this.#apiClient.cloud.addDataToHistory.mutate({
-            dataId,
+    async addFileToHistory({ fileId, nodeId, }) {
+        const addFileToHistory = await this.#apiClient.cloud.addFileToHistory.mutate({
+            fileId,
             nodeId,
         });
-        const node = await apiNodeFullToInternalFull(addDataToHistory, this.#keys);
-        const data = node.history.find((f) => f.id === dataId);
-        if (data !== undefined) {
+        const node = await apiNodeFullToInternalFull(addFileToHistory, this.#keys);
+        const file = node.history.find((f) => f.id === fileId);
+        if (file !== undefined) {
             const users = node.users.filter(([u]) => u.id !== this.#client.app.userId);
-            await this.#apiClient.cloud.shareDataInHistory.mutate({
-                dataId: data.id,
+            await this.#apiClient.cloud.shareFileInHistory.mutate({
+                fileId: file.id,
                 nodeId,
                 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(data.key), userPubKey, this.#keys.privateKey)),
+                        key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(file.key), userPubKey, this.#keys.privateKey)),
                     };
                 })),
             });
         }
         return internalNodeFullToNodeFull(node);
     }
-    async uploadData({ data, encryptProgress, uploadProgress, signal, }) {
-        const dataKey = secretStreamKeygen();
-        const dataBuffer = data instanceof File ? new Uint8Array(await data.arrayBuffer()) : data;
-        const compressed = compress(dataBuffer);
-        const { data: encryptedData, md5: md5Data, md5Encrypted, } = await encrypt(dataKey, compressed, encryptProgress, signal);
-        const encryptedDataKey = encryptCryptoBox(dataKey, this.#keys.publicKey, this.#keys.privateKey);
-        const uploadData = await this.#apiClient.cloud.uploadData.mutate({
-            dataSize: BigInt(encryptedData.byteLength),
-            dataSizeBefore: BigInt(dataBuffer.byteLength),
-            dataKey: sodium.to_hex(encryptedDataKey),
+    async uploadFile({ file, encryptProgress, uploadProgress, signal, }) {
+        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);
+        const encryptedFileKey = encryptCryptoBox(fileKey, this.#keys.publicKey, this.#keys.privateKey);
+        const uploadFile = await this.#apiClient.cloud.uploadFile.mutate({
+            fileSize: BigInt(encryptedFile.byteLength),
+            fileSizeBefore: BigInt(fileBuffer.byteLength),
+            fileKey: sodium.to_hex(encryptedFileKey),
             md5Encrypted,
-            md5: md5Data,
+            md5: md5File,
         });
         await uploadProgress?.({
-            total: encryptedData.byteLength,
+            total: encryptedFile.byteLength,
             current: 0,
             percent: 0,
         });
-        if (uploadData.parts.length === 0) {
+        if (uploadFile.parts.length === 0) {
             await uploadProgress?.({
-                total: encryptedData.byteLength,
-                current: encryptedData.byteLength,
+                total: encryptedFile.byteLength,
+                current: encryptedFile.byteLength,
                 percent: 1,
             });
-            return uploadData.dataId;
+            return uploadFile.id;
         }
         const uploadPartEnded = async (md5, order) => {
-            const { isUploadPartEnded } = await this.#apiClient.cloud.uploadDataPartEnd.mutate({
-                dataId: uploadData.dataId,
+            const { isUploadPartEnded } = await this.#apiClient.cloud.uploadFilePartEnd.mutate({
+                fileId: uploadFile.id,
                 md5,
                 order,
             });
             return isUploadPartEnded;
         };
         const uploadEnded = async () => {
-            const { isUploadEnded } = await this.#apiClient.cloud.uploadDataEnd.mutate({
-                dataId: uploadData.dataId,
+            const { isUploadEnded } = await this.#apiClient.cloud.uploadFileEnd.mutate({
+                fileId: uploadFile.id,
             });
             return isUploadEnded;
         };
         const chunkParts = new Array();
-        for (const [index, chunk] of enumerate(chunks(encryptedData, Number(uploadData.dataPartSize)))) {
+        for (const [index, chunk] of enumerate(chunks(encryptedFile, Number(uploadFile.filePartSize)))) {
             chunkParts.push({
                 order: index + 1,
                 data: chunk,
@@ -99,8 +99,8 @@ export class SecrecyCloudClient {
             progressParts[part] = progressEvent;
             const current = Object.values(progressParts).reduce((prv, cur) => prv + cur.loaded, 0);
             void uploadProgress?.({
-                percent: current / encryptedData.byteLength,
-                total: encryptedData.byteLength,
+                percent: current / encryptedFile.byteLength,
+                total: encryptedFile.byteLength,
                 current,
             });
         };
@@ -113,7 +113,7 @@ export class SecrecyCloudClient {
             for (const [key, value] of Object.entries(part.fields)) {
                 formData.append(key, value);
             }
-            formData.append('data', new Blob([chunk.data]), `${uploadData.dataId}-${chunk.order}`);
+            formData.append('file', new Blob([chunk.data]), `${uploadFile.id}-${chunk.order}`);
             await axios.post(part.url, formData, {
                 onUploadProgress: (progressEvent) => {
                     onProgress(part.order, progressEvent);
@@ -122,22 +122,22 @@ export class SecrecyCloudClient {
             });
             await uploadPartEnded(chunk.md5, chunk.order);
         };
-        await promiseAllLimit(3, uploadData.parts.map((p) => async () => {
+        await promiseAllLimit(3, uploadFile.parts.map((p) => async () => {
             await byPart(p);
         }));
         await uploadEnded();
-        lruCache.set(uploadData.dataId, dataBuffer);
-        return uploadData.dataId;
+        dataCache.set(uploadFile.id, fileBuffer);
+        return uploadFile.id;
     }
-    async uploadDataInCloud({ data, name, nodeId, encryptProgress, uploadProgress, signal, }) {
-        const dataId = await this.uploadData({
-            data,
+    async uploadFileInCloud({ file, name, nodeId, encryptProgress, uploadProgress, signal, }) {
+        const fileId = await this.uploadFile({
+            file,
             encryptProgress,
             uploadProgress,
             signal,
         });
         return await this.saveInCloud({
-            dataId,
+            fileId,
             name,
             nodeId,
         });
@@ -220,11 +220,11 @@ export class SecrecyCloudClient {
         });
         return await apiNodeToExternalNodeFull(node, this.#keys);
     }
-    async dataMetadata({ id }) {
-        const data = await this.#apiClient.cloud.dataById.query({
+    async fileMetadata({ id }) {
+        const file = await this.#apiClient.cloud.fileById.query({
             id,
         });
-        return apiDataToExternal(data, this.#keys);
+        return apiFileToExternal(file, this.#keys);
     }
     async shareNode({ nodeId, userId, rights, }) {
         const publicKey = await this.#client.app.userPublicKey(userId);
@@ -270,26 +270,26 @@ export class SecrecyCloudClient {
         });
         return await apiNodeToExternalNodeFull(updateNode, this.#keys);
     }
-    async dataContent({ dataId, onDownloadProgress, progressDecrypt, signal, }) {
-        const cached = lruCache.get(dataId);
+    async fileContent({ fileId, onDownloadProgress, progressDecrypt, signal, }) {
+        const cached = dataCache.get(fileId);
         if (cached !== undefined) {
             return cached;
         }
-        const dataContent = await this.#apiClient.cloud.dataContentById.query({
-            id: dataId,
+        const fileContent = await this.#apiClient.cloud.fileContentById.query({
+            id: fileId,
         });
         const progressParts = {};
         const onProgress = (part, progressEvent) => {
             progressParts[part] = progressEvent;
             const transferredBytes = Object.values(progressParts).reduce((prv, cur) => prv + cur.transferredBytes, 0);
-            const totalBytes = Number(dataContent.totalSize);
+            const totalBytes = Number(fileContent.totalSize);
             onDownloadProgress?.({
                 percent: transferredBytes / totalBytes,
                 totalBytes,
                 transferredBytes,
             });
         };
-        const encryptedContentFromParts = async (dataParts) => {
+        const encryptedContentFromParts = async (fileParts) => {
             const parts = new Array();
             const byPart = async (part) => {
                 const buf = new Uint8Array(await ky
@@ -303,14 +303,14 @@ export class SecrecyCloudClient {
                     .arrayBuffer());
                 const md5Part = await md5(buf);
                 if (md5Part !== part.md5) {
-                    throw new Error(`Invalid md5 for part ${part.order} of data ${dataId}`);
+                    throw new Error(`Invalid md5 for part ${part.order} of file ${fileId}`);
                 }
                 parts.push({
                     data: buf,
                     order: part.order,
                 });
             };
-            await promiseAllLimit(3, dataParts.map((p) => async () => {
+            await promiseAllLimit(3, fileParts.map((p) => async () => {
                 await byPart(p);
             }));
             return concatenate(...parts.sort((a, b) => a.order - b.order).map((p) => p.data));
@@ -318,42 +318,42 @@ export class SecrecyCloudClient {
         const finalize = async (encryptedContent) => {
             // const md5Encrypted = await firstValueFrom(md5(of(encryptedContent)));
             const md5Encrypted = await md5(encryptedContent);
-            if (md5Encrypted !== dataContent.md5Encrypted) {
+            if (md5Encrypted !== fileContent.md5Encrypted) {
                 throw new Error(`Encrypted content does not match`);
             }
-            const key = decryptCryptoBox(sodium.from_hex(dataContent.key), dataContent.type === 'received_mail'
-                ? dataContent.senderPublicKey
-                : dataContent.type === 'cloud'
-                    ? dataContent.publicKey
+            const key = decryptCryptoBox(sodium.from_hex(fileContent.key), fileContent.type === 'received_mail'
+                ? fileContent.senderPublicKey
+                : fileContent.type === 'cloud'
+                    ? fileContent.publicKey
                     : this.#keys.publicKey, this.#keys.privateKey);
             const src = await decrypt(key, encryptedContent, progressDecrypt, signal);
             // const md5Content = await firstValueFrom(md5(of(src)));
             const md5Content = await md5(src);
-            if (md5Content !== dataContent.md5) {
+            if (md5Content !== fileContent.md5) {
                 throw new Error(`Content does not match`);
             }
             return decompress(src);
         };
-        const encryptedContent = dataContent.type === 'lite'
-            ? dataContent.content
-            : dataContent.type === 'cloud'
-                ? await encryptedContentFromParts(dataContent.parts)
+        const encryptedContent = fileContent.type === 'lite'
+            ? fileContent.content
+            : fileContent.type === 'cloud'
+                ? await encryptedContentFromParts(fileContent.parts)
                 : // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                    dataContent.maybeContent !== null
-                        ? dataContent.maybeContent
-                        : dataContent.maybeParts !== null
-                            ? await encryptedContentFromParts(dataContent.maybeParts)
+                    fileContent.maybeContent !== null
+                        ? fileContent.maybeContent
+                        : fileContent.maybeParts !== null
+                            ? await encryptedContentFromParts(fileContent.maybeParts)
                             : null;
         if (encryptedContent === null) {
-            throw `Can't find content for data ${dataId}`;
+            throw `Can't find content for file ${fileId}`;
         }
         const data = await finalize(encryptedContent);
-        lruCache.set(dataId, data);
+        dataCache.set(fileId, data);
         return data;
     }
-    async deleteData({ dataId, nodeId, }) {
-        const { isDeleted } = await this.#apiClient.cloud.deleteData.mutate({
-            dataId,
+    async deleteFile({ fileId, nodeId, }) {
+        const { isDeleted } = await this.#apiClient.cloud.deleteFile.mutate({
+            fileId,
             nodeId,
         });
         return isDeleted;
@@ -381,7 +381,7 @@ export class SecrecyCloudClient {
         });
         return isMoved;
     }
-    async saveInCloud({ dataId, name, nodeId, }) {
+    async saveInCloud({ fileId, name, nodeId, }) {
         if (nodeId !== undefined && !nodesCache.has(nodeId)) {
             await this.node({ id: nodeId });
             if (!nodesCache.has(nodeId)) {
@@ -394,50 +394,50 @@ export class SecrecyCloudClient {
             }
         }
         let key = '';
-        const data = dataCache.get(dataId);
-        if (data === undefined) {
-            await this.dataMetadata({ id: dataId });
-            const data = dataCache.get(dataId);
-            if (data === undefined) {
+        const file = filesCache.get(fileId);
+        if (file === undefined) {
+            await this.fileMetadata({ id: fileId });
+            const file = filesCache.get(fileId);
+            if (file === undefined) {
                 const receivedMails = await this.#client.mail.receivedMails();
-                const mail = receivedMails.find((m) => m.data.some((f) => f.id === dataId));
+                const mail = receivedMails.find((m) => m.files.some((f) => f.id === fileId));
                 if (mail === undefined) {
                     const err = {
                         name: 'ClientError',
                         code: 'NOT_FOUND',
-                        message: `Can't find mail with the data ${dataId}`,
+                        message: `Can't find mail with the file ${fileId}`,
                     };
                     throw err;
                 }
-                const dataMail = mail.data.find((f) => f.id === dataId);
-                if (dataMail === undefined) {
+                const fileMail = mail.files.find((f) => f.id === fileId);
+                if (fileMail === undefined) {
                     const err = {
                         name: 'ClientError',
                         code: 'NOT_FOUND',
-                        message: `Can't find mail with the data ${dataId}`,
+                        message: `Can't find mail with the file ${fileId}`,
                     };
                     throw err;
                 }
                 const senderPubKey = await this.#client.app.userPublicKey(mail.sender.id);
-                const dataKey = decryptCryptoBox(sodium.from_hex(dataMail.key), senderPubKey, this.#keys.privateKey);
-                key = sodium.to_hex(dataKey);
+                const fileKey = decryptCryptoBox(sodium.from_hex(fileMail.key), senderPubKey, this.#keys.privateKey);
+                key = sodium.to_hex(fileKey);
             }
             else {
-                key = data.key;
+                key = file.key;
             }
         }
         else {
-            key = data.key;
+            key = file.key;
         }
         key = sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), this.#keys.publicKey, this.#keys.privateKey));
         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({
-            dataId,
+            fileId,
             key,
             nodeId: nodeId ?? null,
-            dataName: encryptedName,
+            filename: encryptedName,
             nameKey: encryptedNameKey,
         });
         const node = await apiNodeToExternalNodeFull(saveInCloud, this.#keys);
@@ -468,7 +468,7 @@ export class SecrecyCloudClient {
             nameKey: nameKey !== null
                 ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(nameKey), publicKey, this.#keys.privateKey))
                 : null,
-            data: 'history' in node
+            files: 'history' in node
                 ? node.history.map((f) => ({
                     id: f.id,
                     key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), publicKey, this.#keys.privateKey)),

package/dist/lib/client/SecrecyMailClient.js

@@ -1,4 +1,4 @@
-import { dataCache } from '../cache.js';
+import { filesCache } from '../cache.js';
 import { encryptCryptoBox, sodium } from '../index.js';
 import { convertInternalMailToExternal } from './convert/mail.js';
 export class SecrecyMailClient {
@@ -67,11 +67,11 @@ export class SecrecyMailClient {
         }
         if (senderFiles !== undefined) {
             for (const f of senderFiles) {
-                let data = dataCache.get(f.id);
-                if (data === undefined) {
-                    await this.#client.cloud.dataMetadata({ id: f.id });
-                    data = dataCache.get(f.id);
-                    if (data === undefined) {
+                let file = filesCache.get(f.id);
+                if (file === undefined) {
+                    await this.#client.cloud.fileMetadata({ id: f.id });
+                    file = filesCache.get(f.id);
+                    if (file === undefined) {
                         throw new Error(`File ${f.name} (${f.id}) does not exists`);
                     }
                 }
@@ -132,7 +132,7 @@ export class SecrecyMailClient {
             if (email === undefined) {
                 continue;
             }
-            const input = await this._eachUser(draft.data, draft.subject, draft.body, email);
+            const input = await this._eachUser(draft.files, draft.subject, draft.body, email);
             if (input === null) {
                 temporaryRecipients.push(email);
             }
@@ -141,7 +141,7 @@ export class SecrecyMailClient {
             }
         }
         for (const { id } of draft.recipients) {
-            const input = await this._eachUser(draft.data, draft.subject, draft.body, id);
+            const input = await this._eachUser(draft.files, draft.subject, draft.body, id);
             if (input === null) {
                 temporaryRecipients.push(id);
             }
@@ -167,7 +167,7 @@ export class SecrecyMailClient {
                     continue;
                 }
                 try {
-                    const input = await this._eachUser(mail.data, mail.subject, mail.body, email);
+                    const input = await this._eachUser(mail.files, mail.subject, mail.body, email);
                     if (input === null) {
                         continue;
                     }
@@ -186,16 +186,16 @@ export class SecrecyMailClient {
         const hashKey = sodium.randombytes_buf(sodium.crypto_generichash_KEYBYTES, 'hex');
         const hash = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, JSON.stringify({ body, subject }), hashKey, 'hex');
         for (const f of senderFiles) {
-            let data = dataCache.get(f.id);
-            if (data === undefined) {
-                await this.#client.cloud.dataMetadata({ id: f.id });
-                data = dataCache.get(f.id);
-                if (data === undefined) {
+            let file = filesCache.get(f.id);
+            if (file === undefined) {
+                await this.#client.cloud.fileMetadata({ id: f.id });
+                file = filesCache.get(f.id);
+                if (file === undefined) {
                     throw new Error(`File ${f.name} (${f.id}) does not exists`);
                 }
             }
             senderFiles.push({
-                id: data.id,
+                id: file.id,
                 name: sodium.to_hex(encryptCryptoBox(sodium.from_string(f.name), this.#keys.publicKey, this.#keys.privateKey)),
             });
         }
@@ -254,25 +254,25 @@ export class SecrecyMailClient {
         const unreadReceivedMailsCount = await this.#apiClient.mail.unreadReceivedCount.query({});
         return unreadReceivedMailsCount;
     }
-    _eachUser = async (data, subject, body, idOrMail) => {
+    _eachUser = async (files, subject, body, idOrMail) => {
         // const pubKey = await this.#client.app.userPublicKey(userId)
         const pubKey = await this.#client.app.userPublicKey(idOrMail);
         // const recipientsFiles = new Array<MailFileInput>()
         const recipientsFiles = new Array();
-        for (const f of data) {
-            let dataInHistory = dataCache.get(f.id);
-            if (dataInHistory === undefined) {
-                await this.#client.cloud.dataMetadata({ id: f.id });
-                dataInHistory = dataCache.get(f.id);
-                if (dataInHistory === undefined) {
+        for (const f of files) {
+            let fileInHistory = filesCache.get(f.id);
+            if (fileInHistory === undefined) {
+                await this.#client.cloud.fileMetadata({ id: f.id });
+                fileInHistory = filesCache.get(f.id);
+                if (fileInHistory === undefined) {
                     throw new Error(`File ${f.name} (${f.id}) does not exists`);
                 }
             }
-            const key = dataInHistory.key;
+            const key = fileInHistory.key;
             recipientsFiles.push({
                 id: f.id,
                 name: sodium.to_hex(encryptCryptoBox(sodium.from_string(f.name), pubKey, this.#keys.privateKey)),
-                dataKey: sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), pubKey, this.#keys.privateKey)),
+                fileKey: sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), pubKey, this.#keys.privateKey)),
             });
         }
         return {
@@ -280,7 +280,7 @@ export class SecrecyMailClient {
             recipientId: idOrMail,
             body: sodium.to_hex(encryptCryptoBox(sodium.from_string(body), pubKey, this.#keys.privateKey)),
             subject: sodium.to_hex(encryptCryptoBox(sodium.from_string(subject), pubKey, this.#keys.privateKey)),
-            data: recipientsFiles,
+            files: recipientsFiles,
         };
     };
 }

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

@@ -0,0 +1,29 @@
+import { filesCache } from '../../cache.js';
+import { decryptCryptoBox } from '../../crypto/index.js';
+import { sodium } from '../../sodium.js';
+export function apiFileToInternal(apiFile, keyPair) {
+    const file = {
+        id: apiFile.id,
+        md5: apiFile.md5,
+        md5Encrypted: apiFile.md5Encrypted,
+        createdAt: apiFile.createdAt,
+        size: apiFile.size,
+        sizeBefore: apiFile.sizeBefore,
+        key: sodium.to_hex(decryptCryptoBox(sodium.from_hex(apiFile.access.key), apiFile.access.sharedByPubKey, keyPair.privateKey)),
+    };
+    filesCache.set(file.id, file);
+    return file;
+}
+export function internalFileToFile(internal) {
+    return {
+        id: internal.id,
+        md5: internal.md5,
+        md5Encrypted: internal.md5Encrypted,
+        createdAt: internal.createdAt,
+        size: internal.size,
+        sizeBefore: internal.sizeBefore,
+    };
+}
+export function apiFileToExternal(apiFile, keyPair) {
+    return internalFileToFile(apiFileToInternal(apiFile, keyPair));
+}

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

@@ -30,12 +30,12 @@ export async function convertInternalMailToExternal({ client, mail, keyPair, })
         temporaryRecipients: [], // TODO
         recipients: mI.recipients,
         sender: mail.sender,
-        data: mail.data.map((f) => {
-            const name = sodium.to_string(decryptCryptoBox(sodium.from_hex(f.dataName), pubKey, privateKey));
+        files: mail.files.map((f) => {
+            const name = sodium.to_string(decryptCryptoBox(sodium.from_hex(f.filename), pubKey, privateKey));
             return {
-                id: f.dataId,
+                id: f.fileId,
                 name,
-                key: f.dataKey,
+                key: f.fileKey,
             };
         }),
     };

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

@@ -1,8 +1,8 @@
 import { sodium } from '../../sodium.js';
 import { decryptCryptoBox } from '../../crypto/index.js';
 import { nodesCache } from '../../cache.js';
-import { decryptSecretStream } from '../../crypto/data.js';
-import { apiDataToInternal, internalDataToExternalData } from './data.js';
+import { decryptSecretStream } from '../../crypto/file.js';
+import { apiFileToInternal, internalFileToFile } from './file.js';
 export async function apiNodeToInternal(apiNode, keyPair) {
     const internal = {
         id: apiNode.id,
@@ -23,7 +23,7 @@ export async function apiNodeToInternal(apiNode, keyPair) {
         deletedAt: apiNode.deletedAt,
         users: apiNode.users,
         parentId: apiNode.parentId ?? null,
-        currentDataId: apiNode.currentDataId ?? null,
+        currentFileId: apiNode.currentFileId ?? null,
     };
     internal.access = { ...apiNode.access };
     if (apiNode.access.nameKey !== null) {
@@ -47,13 +47,13 @@ export async function apiNodeFullToInternalFull(apiNodeFull, keyPair) {
     return {
         ...f,
         current: apiNodeFull.current !== null
-            ? apiDataToInternal(apiNodeFull.current, keyPair)
+            ? apiFileToInternal(apiNodeFull.current, keyPair)
             : undefined,
         parent: apiNodeFull.parent !== null
             ? await apiNodeToInternal(apiNodeFull.parent, keyPair)
             : null,
         children: await Promise.all(apiNodeFull.children.map(async (s) => await apiNodeToInternal(s, keyPair))),
-        history: apiNodeFull.history.map((f) => apiDataToInternal(f, keyPair)),
+        history: apiNodeFull.history.map((f) => apiFileToInternal(f, keyPair)),
     };
 }
 export function internalNodeToNode(internal) {
@@ -76,9 +76,9 @@ export function internalNodeFullToNodeFull(internal) {
         ...internalNodeToNode(internal),
         parent: internal.parent !== null ? internalNodeToNode(internal.parent) : null,
         children: internal.children.map(internalNodeToNode),
-        history: internal.history.map((f) => internalDataToExternalData(f)),
+        history: internal.history.map((f) => internalFileToFile(f)),
         current: internal.current !== null && internal.current !== undefined
-            ? internalDataToExternalData(internal.current)
+            ? internalFileToFile(internal.current)
             : undefined,
     };
 }

package/dist/lib/client/index.js

@@ -1,10 +1,10 @@
 import { BaseClient } from '../base-client.js';
-import { encryptSecretStream } from '../crypto/data.js';
+import { encryptSecretStream } from '../crypto/file.js';
 import { sodium } from '../sodium.js';
 import { SecrecyCloudClient } from './SecrecyCloudClient.js';
 import { SecrecyMailClient } from './SecrecyMailClient.js';
 import { SecrecyAppClient } from './SecrecyAppClient.js';
-import { nodesCache, dataCache, publicKeysCache } from '../cache.js';
+import { nodesCache, filesCache, publicKeysCache } from '../cache.js';
 import { SecrecyDbClient } from './SecrecyDbClient.js';
 import { SecrecyWalletClient } from './SecrecyWalletClient.js';
 import { SecrecyPayClient } from './SecrecyPayClient.js';
@@ -53,7 +53,7 @@ export class SecrecyClient extends BaseClient {
     }
     async logout(sessionId) {
         nodesCache.clear();
-        dataCache.clear();
+        filesCache.clear();
         publicKeysCache.clear();
         await super.logout(sessionId);
     }