@secrecy/lib 1.30.0-feat-rename-file.1 → 1.31.0

package/dist/lib/cache.js

@@ -4,7 +4,7 @@ export const dataCache = new Map();
 export const nodesCache = new Map();
 export const usersCache = new Map();
 export const publicKeysCache = new Map();
-export const lruCache = new LRUCache({
+export const dataContentCache = new LRUCache({
     max: 500,
     maxSize: gigaToBytes(0.5),
     sizeCalculation: (value) => {

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import ky from 'ky';
 import { encryptName } from '../index.js';
-import { nodesCache, dataCache, lruCache } from '../cache.js';
+import { nodesCache, dataCache, dataContentCache } from '../cache.js';
 import { secretStreamKeygen } from '../crypto/data.js';
 import { decryptCryptoBox, encryptCryptoBox } from '../crypto/index.js';
 import { compress, decompress } from '../minify/index.js';
@@ -65,16 +65,19 @@ export class SecrecyCloudClient {
             percent: 0,
         });
         if (uploadData.parts.length === 0) {
+            if (uploadData.keyPair.pub !== this.#keys.publicKey) {
+                throw new Error('The public key does not match with cached key!');
+            }
             await uploadProgress?.({
                 total: encryptedData.byteLength,
                 current: encryptedData.byteLength,
                 percent: 1,
             });
-            return uploadData.dataId;
+            return uploadData.id;
         }
         const uploadDataPartEnd = async (md5, order) => {
             const { isUploadPartEnded } = await this.#apiClient.cloud.uploadDataPartEnd.mutate({
-                dataId: uploadData.dataId,
+                dataId: uploadData.id,
                 md5,
                 order,
             });
@@ -82,12 +85,12 @@ export class SecrecyCloudClient {
         };
         const uploadEnded = async () => {
             const { isUploadEnded } = await this.#apiClient.cloud.uploadDataEnd.mutate({
-                dataId: uploadData.dataId,
+                dataId: uploadData.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(encryptedData, Number(uploadData.partSize)))) {
             chunkParts.push({
                 order: index + 1,
                 data: chunk,
@@ -113,7 +116,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('data', new Blob([chunk.data]), `${uploadData.id}-${chunk.order}`);
             await axios.post(part.url, formData, {
                 onUploadProgress: (progressEvent) => {
                     onProgress(part.order, progressEvent);
@@ -126,8 +129,8 @@ export class SecrecyCloudClient {
             await byPart(p);
         }));
         await uploadEnded();
-        lruCache.set(uploadData.dataId, dataBuffer);
-        return uploadData.dataId;
+        dataContentCache.set(uploadData.id, dataBuffer);
+        return uploadData.id;
     }
     async uploadDataInCloud({ data, name, nodeId, encryptProgress, uploadProgress, signal, }) {
         const dataId = await this.uploadData({
@@ -271,7 +274,7 @@ export class SecrecyCloudClient {
         return await apiNodeToExternalNodeFull(updateNode, this.#keys);
     }
     async dataContent({ dataId, onDownloadProgress, progressDecrypt, signal, }) {
-        const cached = lruCache.get(dataId);
+        const cached = dataContentCache.get(dataId);
         if (cached !== undefined) {
             return cached;
         }
@@ -335,12 +338,12 @@ export class SecrecyCloudClient {
             return decompress(src);
         };
         const encryptedContent = dataContent.type === 'lite'
-            ? dataContent.content
+            ? new Uint8Array(dataContent.content)
             : dataContent.type === 'cloud'
                 ? await encryptedContentFromParts(dataContent.parts)
                 : // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     dataContent.maybeContent !== null
-                        ? dataContent.maybeContent
+                        ? new Uint8Array(dataContent.maybeContent)
                         : dataContent.maybeParts !== null
                             ? await encryptedContentFromParts(dataContent.maybeParts)
                             : null;
@@ -348,7 +351,7 @@ export class SecrecyCloudClient {
             throw `Can't find content for data ${dataId}`;
         }
         const data = await finalize(encryptedContent);
-        lruCache.set(dataId, data);
+        dataContentCache.set(dataId, data);
         return data;
     }
     async deleteData({ dataId, nodeId, }) {

package/dist/types/cache.d.ts

@@ -10,4 +10,4 @@ export declare const usersCache: Map<string, {
     isSearchable: boolean;
 }>;
 export declare const publicKeysCache: Map<string, string>;
-export declare const lruCache: LRUCache<string, Uint8Array, unknown>;
+export declare const dataContentCache: LRUCache<string, Uint8Array, unknown>;

package/dist/types/client.d.ts

@@ -4400,22 +4400,32 @@ export declare const createTRPCClient: (session?: string | null | undefined, onA
                     dataKey: string;
                 };
                 _output_in: {
-                    dataId: string;
+                    id: string;
+                    keyPair: {
+                        pub: string;
+                        encPriv: string;
+                    };
+                    key: string;
+                    partSize: bigint;
                     parts: {
                         fields: Record<string, string>;
                         url: string;
                         order: number;
                     }[];
-                    dataPartSize: bigint;
                 };
                 _output_out: {
-                    dataId: string;
+                    id: string;
+                    keyPair: {
+                        pub: string;
+                        encPriv: string;
+                    };
+                    key: string;
+                    partSize: bigint;
                     parts: {
                         fields: Record<string, string>;
                         url: string;
                         order: number;
                     }[];
-                    dataPartSize: bigint;
                 };
             }, unknown>>;
         };
@@ -4483,9 +4493,19 @@ export declare const createTRPCClient: (session?: string | null | undefined, onA
                 };
                 _output_in: {
                     id: string;
+                    keyPair: {
+                        pub: string;
+                        encPriv: string;
+                    };
+                    key: string;
                 };
                 _output_out: {
                     id: string;
+                    keyPair: {
+                        pub: string;
+                        encPriv: string;
+                    };
+                    key: string;
                 };
             }, unknown>>;
         };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.30.0-feat-rename-file.1",
+  "version": "1.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "@secrecy/lib-utils": "^1.0.18",
-    "@secrecy/trpc-api-types": "1.27.0-feat-rename-file.13",
+    "@secrecy/trpc-api-types": "1.27.0-feat-file-upload-access.2",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "@types/libsodium-wrappers-sumo": "^0.7.8",