@secrecy/lib 1.65.0-feat-next15.3 → 1.65.0-feat-next15.4

package/dist/lib/client/SecrecyCloudClient.js

@@ -14,6 +14,7 @@ import { kiloToBytes } from '../utils.js';
 import { fileTypeFromBuffer } from 'file-type';
 import { encryptName, generateAndEncryptNameAndKey } from '../crypto/domain.js';
 import { chunkByTotalItems } from '../utils/object.js';
+import axios from 'axios';
 export class SecrecyCloudClient {
     #client;
     #keys;
@@ -24,10 +25,7 @@ export class SecrecyCloudClient {
         this.#apiClient = apiClient;
     }
     async addDataToHistory({ dataId, nodeId, }) {
-        const addDataToHistory = await this.#apiClient.cloud.addDataToHistory.mutate({
-            dataId,
-            nodeId,
-        });
+        const addDataToHistory = await this.#apiClient.cloud.addDataToHistory.mutate({ dataId, nodeId });
         const node = await apiNodeFullToInternalFull(addDataToHistory, this.#keys);
         const data = node.history.find((d) => d.id === dataId);
         if (data !== undefined) {
@@ -73,10 +71,7 @@ export class SecrecyCloudClient {
         const dataKey = encrypted ? secretStreamKeygen() : null;
         const { data: encryptedData, md5: md5Data, md5Encrypted, } = dataKey
             ? await encrypt(dataKey, compressed, encryptProgress, signal)
-            : {
-                data: compressed,
-                md5: await md5(compressed),
-            };
+            : { data: compressed, md5: await md5(compressed) };
         const encryptedDataKey = dataKey
             ? encryptCryptoBox(dataKey, this.#keys.publicKey, this.#keys.privateKey)
             : null;
@@ -167,11 +162,7 @@ export class SecrecyCloudClient {
                 return localData;
             }
             const uploadDataPartEnd = async (md5, order) => {
-                return this.#apiClient.cloud.uploadDataPartEnd.mutate({
-                    dataId: uploadData.id,
-                    md5,
-                    order,
-                }, { signal });
+                return this.#apiClient.cloud.uploadDataPartEnd.mutate({ dataId: uploadData.id, md5, order }, { signal });
             };
             const chunkParts = new Array();
             for (const [index, chunk] of enumerate(chunks(encryptedData, Number(uploadData.partSize)))) {
@@ -201,11 +192,14 @@ export class SecrecyCloudClient {
                     formData.append(key, value);
                 }
                 formData.append('file', new Blob([chunk.data.slice(0)], { type: filetype?.mime }), `${uploadData.id}-${chunk.order}`);
-                await ky.post(part.url, {
+                await axios.post(part.url, formData, {
                     signal,
-                    body: formData,
                     onUploadProgress: (progressEvent) => {
-                        onProgress(part.order, progressEvent);
+                        onProgress(part.order, {
+                            percent: progressEvent.progress ?? 0,
+                            totalBytes: progressEvent.total ?? 0,
+                            transferredBytes: progressEvent.loaded ?? 0,
+                        });
                     },
                 });
                 return uploadDataPartEnd(chunk.md5, chunk.order);
@@ -234,11 +228,7 @@ export class SecrecyCloudClient {
             uploadProgress,
             signal,
         });
-        return await this.saveInCloud({
-            dataId: uploadedData.id,
-            name,
-            nodeId,
-        });
+        return await this.saveInCloud({ dataId: uploadedData.id, name, nodeId });
     }
     async deletedNodes() {
         const deletedNodes = await this.#apiClient.cloud.nodesDeleted.query({});
@@ -249,9 +239,7 @@ export class SecrecyCloudClient {
         return await Promise.all(nodesShared.map(async (node) => await apiNodeToExternal(node, this.#keys)));
     }
     async nodesSharedWithMe(type = 'FOLDER') {
-        const nodesSharedWithMe = await this.#apiClient.cloud.nodesSharedWithMe.query({
-            type,
-        });
+        const nodesSharedWithMe = await this.#apiClient.cloud.nodesSharedWithMe.query({ type });
         return await Promise.all(nodesSharedWithMe.map(async (node) => await apiNodeToExternal(node, this.#keys)));
     }
     async deleteNodeSharing({ nodeId, userId, }) {
@@ -285,9 +273,7 @@ export class SecrecyCloudClient {
         return isDuplicated;
     }
     async deleteNodeCloudTrash({ ids }) {
-        const { isDeleted } = await this.#apiClient.cloud.deleteNodeCloudTrash.mutate({
-            ids,
-        });
+        const { isDeleted } = await this.#apiClient.cloud.deleteNodeCloudTrash.mutate({ ids });
         return isDeleted;
     }
     async createFolder({ name, parentFolderId, }) {
@@ -318,16 +304,11 @@ export class SecrecyCloudClient {
         return folder;
     }
     async node({ id, deleted, } = {}) {
-        const node = await this.#apiClient.cloud.nodeFullById.query({
-            id,
-            deleted,
-        });
+        const node = await this.#apiClient.cloud.nodeFullById.query({ id, deleted });
         return await apiNodeToExternalNodeFull(node, this.#keys);
     }
     async dataMetadata({ id }) {
-        const data = await this.#apiClient.cloud.dataById.query({
-            id,
-        });
+        const data = await this.#apiClient.cloud.dataById.query({ id });
         return apiDataToExternal(data, this.#keys);
     }
     async shareNode(input, progress) {
@@ -339,11 +320,7 @@ export class SecrecyCloudClient {
         const publicKeysMap = await this.#client.app.userPublicKey(neededUserKey);
         const maxNodesBatchSize = 1000;
         const totalNodesToShare = Object.values(nodesMap).reduce((size, ids) => size + ids.length, 0);
-        progress?.({
-            total: totalNodesToShare,
-            current: 0,
-            percent: 0,
-        });
+        progress?.({ total: totalNodesToShare, current: 0, percent: 0 });
         const chunks = totalNodesToShare > maxNodesBatchSize
             ? chunkByTotalItems(nodesMap, maxNodesBatchSize)
             : [nodesMap];
@@ -444,23 +421,14 @@ export class SecrecyCloudClient {
                         id: node.id,
                         ...nodes.permissions,
                         nameKey: node.nameKey,
-                        data: node.data.map((d) => ({
-                            id: d.id,
-                            key: d.key,
-                        })),
+                        data: node.data.map((d) => ({ id: d.id, key: d.key })),
                     })),
                 });
             }
             for (const [userId, nodes] of Object.entries(nodesToUpdateRights)) {
                 finishInput.push(...nodes.map((node) => ({
                     userId,
-                    nodes: [
-                        {
-                            id: node.nodeId,
-                            data: [],
-                            ...node.permissions,
-                        },
-                    ],
+                    nodes: [{ id: node.nodeId, data: [], ...node.permissions }],
                 })));
             }
             const subState = await this.#apiClient.cloud.shareNodeFinish.mutate(finishInput);
@@ -498,10 +466,7 @@ export class SecrecyCloudClient {
         const errorDetailsLength = details.invalidRightsAccesses.length +
             details.missingDataAccesses.length +
             details.missingNodeAccesses.length;
-        return {
-            isFinished: errorDetailsLength === 0,
-            details: details,
-        };
+        return { isFinished: errorDetailsLength === 0, details: details };
     }
     async updateNode({ nodeId, name, isFavorite, deletedAt, }) {
         let node = nodesCache.get(nodeId);
@@ -584,9 +549,7 @@ export class SecrecyCloudClient {
         }));
     }
     async deleteNodes({ nodeIds, }) {
-        return this.#apiClient.cloud.deleteNodes.mutate({
-            ids: nodeIds,
-        });
+        return this.#apiClient.cloud.deleteNodes.mutate({ ids: nodeIds });
     }
     async deleteData({ dataId, nodeId, }) {
         const { isDeleted } = await this.#apiClient.cloud.deleteData.mutate({

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.65.0-feat-next15.3",
+  "version": "1.65.0-feat-next15.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"
@@ -79,6 +79,7 @@
     "@trpc/client": "11.5.0",
     "@trpc/server": "11.5.0",
     "@types/libsodium-wrappers-sumo": "^0.7.8",
+    "axios": "^1.11.0",
     "bson": "^6.10.4",
     "ethers": "^6.15.0",
     "file-type": "^21.0.0",