@secrecy/lib 1.42.3 → 1.43.0-feat-unencrypted-data.1

package/dist/lib/client/SecrecyCloudClient.js

@@ -40,35 +40,52 @@ export class SecrecyCloudClient {
                     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: data.key
+                            ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(data.key), userPubKey, this.#keys.privateKey))
+                            : null,
                     };
                 })),
             });
         }
         return internalNodeFullToNodeFull(node);
     }
-    async uploadLiteData({ data, encryptProgress, uploadProgress, signal, }) {
+    async uploadLiteData({ data, encrypted = true, encryptProgress, uploadProgress, signal, }) {
         const dataBuffer = data instanceof File ? new Uint8Array(await data.arrayBuffer()) : data;
         if (dataBuffer.byteLength > kiloToBytes(4500)) {
             throw new Error('The data is too big for lite upload!');
         }
         const compressed = compress(dataBuffer);
-        const dataKey = secretStreamKeygen();
-        const { data: encryptedData, md5: md5Data, md5Encrypted, } = await encrypt(dataKey, compressed, encryptProgress, signal);
-        const encryptedDataKey = encryptCryptoBox(dataKey, this.#keys.publicKey, this.#keys.privateKey);
+        const dataKey = encrypted ? secretStreamKeygen() : null;
+        const { data: encryptedData, md5: md5Data, md5Encrypted, } = dataKey
+            ? await encrypt(dataKey, compressed, encryptProgress, signal)
+            : {
+                data: compressed,
+                md5: await md5(compressed),
+            };
+        const encryptedDataKey = dataKey
+            ? encryptCryptoBox(dataKey, this.#keys.publicKey, this.#keys.privateKey)
+            : null;
         await uploadProgress?.({
             total: encryptedData.byteLength,
             current: 0,
             percent: 0,
         });
-        const uploadData = await this.#apiClient.cloud.uploadLiteData.mutate({
-            content: Buffer.from(encryptedData),
-            dataSize: BigInt(encryptedData.byteLength),
-            dataSizeBefore: BigInt(dataBuffer.byteLength),
-            dataKey: sodium.to_hex(encryptedDataKey),
-            md5Encrypted,
-            md5: md5Data,
-        }, { signal });
+        const uploadData = await this.#apiClient.cloud.uploadLiteData.mutate(encryptedDataKey && md5Encrypted
+            ? {
+                type: 'encrypted',
+                content: Buffer.from(encryptedData),
+                sizeEncrypted: BigInt(encryptedData.byteLength),
+                size: BigInt(dataBuffer.byteLength),
+                key: sodium.to_hex(encryptedDataKey),
+                md5Encrypted,
+                md5: md5Data,
+            }
+            : {
+                type: 'unencrypted',
+                content: Buffer.from(encryptedData),
+                md5: md5Data,
+                size: BigInt(dataBuffer.byteLength),
+            }, { signal });
         await uploadProgress?.({
             total: encryptedData.byteLength,
             current: encryptedData.byteLength,
@@ -76,19 +93,33 @@ export class SecrecyCloudClient {
         });
         return uploadData.id;
     }
-    async uploadData({ data, encryptProgress, uploadProgress, signal, }) {
-        const dataKey = secretStreamKeygen();
+    async uploadData({ data, encrypted = true, encryptProgress, uploadProgress, signal, }) {
+        const dataKey = encrypted ? secretStreamKeygen() : null;
         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),
-            md5Encrypted,
-            md5: md5Data,
-        }, { signal });
+        const { data: encryptedData, md5: md5Data, md5Encrypted, } = dataKey
+            ? await encrypt(dataKey, compressed, encryptProgress, signal)
+            : {
+                data: compressed,
+                md5: await md5(compressed),
+            };
+        const encryptedDataKey = dataKey
+            ? encryptCryptoBox(dataKey, this.#keys.publicKey, this.#keys.privateKey)
+            : null;
+        const uploadData = await this.#apiClient.cloud.uploadData.mutate(encryptedDataKey && md5Encrypted
+            ? {
+                type: 'encrypted',
+                sizeEncrypted: BigInt(encryptedData.byteLength),
+                size: BigInt(dataBuffer.byteLength),
+                key: sodium.to_hex(encryptedDataKey),
+                md5Encrypted,
+                md5: md5Data,
+            }
+            : {
+                type: 'unencrypted',
+                md5: md5Data,
+                size: BigInt(dataBuffer.byteLength),
+            }, { signal });
         await uploadProgress?.({
             total: encryptedData.byteLength,
             current: 0,
@@ -361,12 +392,16 @@ export class SecrecyCloudClient {
             if (md5Encrypted !== dataContent.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
-                    : this.#keys.publicKey, this.#keys.privateKey);
-            const src = await decrypt(key, encryptedContent, progressDecrypt, signal);
+            const key = dataContent.key
+                ? decryptCryptoBox(sodium.from_hex(dataContent.key), dataContent.type === 'received_mail'
+                    ? dataContent.senderPublicKey
+                    : dataContent.type === 'cloud'
+                        ? dataContent.publicKey
+                        : this.#keys.publicKey, this.#keys.privateKey)
+                : null;
+            const src = key
+                ? await decrypt(key, encryptedContent, progressDecrypt, signal)
+                : encryptedContent;
             // const md5Content = await firstValueFrom(md5(of(src)));
             const md5Content = await md5(src);
             if (md5Content !== dataContent.md5) {
@@ -433,7 +468,7 @@ export class SecrecyCloudClient {
                 throw err;
             }
         }
-        let key = '';
+        let key = null;
         const data = dataCache.get(dataId);
         if (data === undefined) {
             await this.dataMetadata({ id: dataId });
@@ -459,8 +494,10 @@ export class SecrecyCloudClient {
                     throw err;
                 }
                 const senderPubKey = await this.#client.app.userPublicKey(mail.sender.id);
-                const dataKey = decryptCryptoBox(sodium.from_hex(attachment.key), senderPubKey, this.#keys.privateKey);
-                key = sodium.to_hex(dataKey);
+                const dataKey = attachment.key
+                    ? decryptCryptoBox(sodium.from_hex(attachment.key), senderPubKey, this.#keys.privateKey)
+                    : null;
+                key = dataKey !== null ? sodium.to_hex(dataKey) : null;
             }
             else {
                 key = data.key;
@@ -469,7 +506,9 @@ export class SecrecyCloudClient {
         else {
             key = data.key;
         }
-        key = sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), this.#keys.publicKey, this.#keys.privateKey));
+        key = key
+            ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), this.#keys.publicKey, this.#keys.privateKey))
+            : null;
         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));
@@ -511,7 +550,9 @@ export class SecrecyCloudClient {
             data: 'history' in node
                 ? node.history.map((f) => ({
                     id: f.id,
-                    key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), publicKey, this.#keys.privateKey)),
+                    key: f.key
+                        ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(f.key), publicKey, this.#keys.privateKey))
+                        : null,
                 }))
                 : [],
         };

package/dist/lib/client/SecrecyMailClient.js

@@ -277,9 +277,11 @@ export class SecrecyMailClient {
             }
             const key = dataInHistory.key;
             attachments.push({
-                id: f.id,
+                dataId: f.id,
                 name: sodium.to_hex(encryptCryptoBox(sodium.from_string(f.name), pubKey, this.#keys.privateKey)),
-                key: sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), pubKey, this.#keys.privateKey)),
+                key: key
+                    ? sodium.to_hex(encryptCryptoBox(sodium.from_hex(key), pubKey, this.#keys.privateKey))
+                    : null,
             });
         }
         return {

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

@@ -8,8 +8,10 @@ export function apiDataToInternal(apiData, keyPair) {
         md5Encrypted: apiData.md5Encrypted,
         createdAt: apiData.createdAt,
         size: apiData.size,
-        sizeBefore: apiData.sizeBefore,
-        key: sodium.to_hex(decryptCryptoBox(sodium.from_hex(apiData.access.key), apiData.access.sharedByPubKey, keyPair.privateKey)),
+        sizeEncrypted: apiData.sizeEncrypted,
+        key: apiData.access.key
+            ? sodium.to_hex(decryptCryptoBox(sodium.from_hex(apiData.access.key), apiData.access.sharedByPubKey, keyPair.privateKey))
+            : null,
     };
     dataCache.set(data.id, data);
     return data;
@@ -21,7 +23,7 @@ export function internalDataToExternalData(internal) {
         md5Encrypted: internal.md5Encrypted,
         createdAt: internal.createdAt,
         size: internal.size,
-        sizeBefore: internal.sizeBefore,
+        sizeEncrypted: internal.sizeEncrypted,
     };
 }
 export function apiDataToExternal(apiData, keyPair) {

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

@@ -16,7 +16,7 @@ export async function apiNodeToInternal(apiNode, keyPair) {
             ? apiNode.sizes
             : {
                 size: 0n,
-                sizeBefore: 0n,
+                sizeEncrypted: 0n,
             },
         createdAt: apiNode.createdAt,
         updatedAt: apiNode.updatedAt,

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

@@ -9,14 +9,16 @@ export declare class SecrecyCloudClient {
         dataId: string;
         nodeId: string;
     }): Promise<NodeFull>;
-    uploadLiteData({ data, encryptProgress, uploadProgress, signal, }: {
+    uploadLiteData({ data, encrypted, encryptProgress, uploadProgress, signal, }: {
         data: globalThis.File | Uint8Array;
+        encrypted?: boolean;
         encryptProgress?: ProgressCallback;
         uploadProgress?: ProgressCallback;
         signal?: AbortSignal;
     }): Promise<string>;
-    uploadData({ data, encryptProgress, uploadProgress, signal, }: {
+    uploadData({ data, encrypted, encryptProgress, uploadProgress, signal, }: {
         data: globalThis.File | Uint8Array;
+        encrypted?: boolean;
         encryptProgress?: ProgressCallback;
         uploadProgress?: ProgressCallback;
         signal?: AbortSignal;

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

@@ -1,6 +1,6 @@
 import { type RouterOutputs } from '../../client.js';
-export type DataMetadata = Pick<ApiData, 'id' | 'size' | 'sizeBefore' | 'md5' | 'md5Encrypted' | 'createdAt'>;
+export type DataMetadata = Pick<ApiData, 'id' | 'size' | 'sizeEncrypted' | 'md5' | 'md5Encrypted' | 'createdAt'>;
 export type InternalData = DataMetadata & {
-    key: string;
+    key: string | null;
 };
 export type ApiData = NonNullable<RouterOutputs['cloud']['dataById']>;

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

@@ -18,7 +18,7 @@ export interface BaseMail {
     attachments: Array<{
         id: string;
         name: string;
-        key: string;
+        key: string | null;
     }>;
 }
 export interface ReceivedMail extends BaseMail {
@@ -75,7 +75,7 @@ export interface WaitingReceivedMail {
     temporaryRecipients: TemporaryMailUser[];
 }
 export interface MailData {
-    dataKey: string;
+    dataKey: string | null;
     dataName: string;
     data: {
         id: string;

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

@@ -15,7 +15,7 @@ export interface NodeBreadcrumbItemWithPubKey extends NodeBreadcrumbItem {
 }
 export interface NodeSize {
     size: bigint;
-    sizeBefore: bigint;
+    sizeEncrypted: bigint;
 }
 type NameKey = {
     nameKey: string | null;