@secrecy/lib 1.68.0-feat-anonymous-upload.2 → 1.69.0-feat-anonymous-upload.1

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import ky from 'ky';
 import { nodesCache, dataCache, dataContentCache, nodesEncryptionCache, } from '../cache.js';
 import { secretStreamKeygen } from '../crypto/data.js';
@@ -15,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;
@@ -25,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) {
@@ -74,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;
@@ -169,11 +163,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)))) {
@@ -186,7 +176,7 @@ export class SecrecyCloudClient {
             const progressParts = {};
             const onProgress = (part, progressEvent) => {
                 progressParts[part] = progressEvent;
-                const current = Object.values(progressParts).reduce((prv, cur) => prv + cur.loaded, 0);
+                const current = Object.values(progressParts).reduce((prv, cur) => prv + cur.transferredBytes, 0);
                 void uploadProgress?.({
                     percent: current / encryptedData.byteLength,
                     total: encryptedData.byteLength,
@@ -203,11 +193,21 @@ export class SecrecyCloudClient {
                     formData.append(key, value);
                 }
                 formData.append('file', new Blob([chunk.data], { type: filetype?.mime }), `${uploadData.id}-${chunk.order}`);
+                // await ky.post(part.url, {
+                //   signal,
+                //   body: formData,
+                //   onUploadProgress: (progressEvent) => {
+                //     onProgress(part.order, progressEvent)
+                //   },
+                // })
                 await axios.post(part.url, formData, {
                     onUploadProgress: (progressEvent) => {
-                        onProgress(part.order, progressEvent);
+                        onProgress(part.order, {
+                            percent: progressEvent.progress ?? 0,
+                            totalBytes: progressEvent.total ?? 0,
+                            transferredBytes: progressEvent.loaded,
+                        });
                     },
-                    signal,
                 });
                 return uploadDataPartEnd(chunk.md5, chunk.order);
             };
@@ -235,11 +235,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({});
@@ -250,9 +246,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, }) {
@@ -286,9 +280,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, }) {
@@ -319,16 +311,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) {
@@ -340,11 +327,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];
@@ -465,13 +448,7 @@ export class SecrecyCloudClient {
             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);
@@ -509,10 +486,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);
@@ -595,9 +569,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/dist/lib/client.js

@@ -1,16 +1,10 @@
-import { httpBatchLink, loggerLink, createTRPCProxyClient, TRPCClientError, } from '@trpc/client';
-import superjson from 'superjson';
+import { httpBatchLink, loggerLink, createTRPCClient as innerCreateTRPCClient, TRPCClientError, } from '@trpc/client';
 import { SECRECY_LIB_VERSION } from './versioning.js';
+import { transformer } from './transformer.js';
 export function isTRPCClientError(cause) {
     return cause instanceof TRPCClientError;
 }
-superjson.registerCustom({
-    isApplicable: (v) => v instanceof Buffer,
-    serialize: (v) => [...v],
-    deserialize: (v) => Buffer.from(v),
-}, 'buffer');
-export const createTRPCClient = (opts) => createTRPCProxyClient({
-    transformer: superjson,
+export const createTRPCClient = (opts) => innerCreateTRPCClient({
     links: [
         loggerLink({
             enabled: (op) => {
@@ -24,6 +18,7 @@ export const createTRPCClient = (opts) => createTRPCProxyClient({
             },
         }),
         httpBatchLink({
+            transformer,
             url: opts.apiUrl
                 ? `${opts.apiUrl}/trpc`
                 : 'https://api.secrecy.tech/trpc',

package/dist/lib/transformer.js

@@ -0,0 +1,18 @@
+import { Temporal } from '@js-temporal/polyfill';
+import superjson from 'superjson';
+superjson.registerCustom({
+    isApplicable: (v) => v instanceof Temporal.PlainDate,
+    serialize: (v) => v.toJSON(),
+    deserialize: (v) => Temporal.PlainDate.from(v),
+}, 'Temporal.PlainDate');
+superjson.registerCustom({
+    isApplicable: (v) => v instanceof Temporal.PlainDateTime,
+    serialize: (v) => v.toJSON(),
+    deserialize: (v) => Temporal.PlainDateTime.from(v),
+}, 'Temporal.PlainDateTime');
+superjson.registerCustom({
+    isApplicable: (v) => v instanceof Buffer,
+    serialize: (v) => [...v],
+    deserialize: (v) => Buffer.from(v),
+}, 'buffer');
+export const transformer = superjson;

package/dist/types/cache.d.ts

@@ -4,9 +4,9 @@ export declare const dataCache: Map<string, InternalData>;
 export declare const nodesCache: Map<string, InternalNode | InternalNodeFull>;
 export declare const nodesEncryptionCache: Map<string, InternalMinimalNodeForEncryption>;
 export declare const usersCache: Map<string, {
-    id: string;
-    lastname: string;
     firstname: string;
+    lastname: string;
+    id: string;
     avatar: string | null;
     isSearchable: boolean;
 }>;

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

@@ -1,7 +1,7 @@
 import type { ProgressCallback, SecrecyClient } from '../index.js';
 import type { DataMetadata, DataStorageType, KeyPair, LocalData, Node, NodeFull, NodeType } from './types/index.js';
 import { type RouterInputs, type ApiClient, type RouterOutputs } from '../client.js';
-import { type DownloadProgress } from '../types.js';
+import { type Progress } from '../types.js';
 import { FileTypeResult } from 'file-type';
 export declare class SecrecyCloudClient {
     #private;
@@ -12,7 +12,7 @@ export declare class SecrecyCloudClient {
     }): Promise<NodeFull>;
     uploadData({ storageType, data, encrypted, encryptProgress, uploadProgress, signal, meta, }: {
         storageType: DataStorageType;
-        data: globalThis.File | Uint8Array;
+        data: globalThis.File | Uint8Array<ArrayBuffer>;
         encrypted?: boolean;
         encryptProgress?: ProgressCallback;
         uploadProgress?: ProgressCallback;
@@ -20,7 +20,7 @@ export declare class SecrecyCloudClient {
         meta?: FileTypeResult | true;
     }): Promise<LocalData>;
     uploadDataInCloud({ data, name, nodeId, encryptProgress, uploadProgress, storageType, signal, }: {
-        data: globalThis.File | Uint8Array;
+        data: globalThis.File | Uint8Array<ArrayBuffer>;
         name: string;
         nodeId?: string;
         encryptProgress?: ProgressCallback;
@@ -63,13 +63,13 @@ export declare class SecrecyCloudClient {
     }): Promise<NodeFull>;
     dataContent({ dataId, onDownloadProgress, progressDecrypt, signal, }: {
         dataId: string;
-        onDownloadProgress?: (progress: DownloadProgress) => void;
+        onDownloadProgress?: (progress: Progress) => void;
         progressDecrypt?: ProgressCallback;
         signal?: AbortSignal;
     }): Promise<LocalData>;
     dataContents({ dataIds, onDownloadProgress, progressDecrypt, signal, }: {
         dataIds: string[];
-        onDownloadProgress?: (progress: DownloadProgress) => void;
+        onDownloadProgress?: (progress: Progress) => void;
         progressDecrypt?: ProgressCallback;
         signal?: AbortSignal;
     }): Promise<LocalData[]>;
@@ -104,28 +104,29 @@ export declare class SecrecyCloudClient {
         toType: "s3" | "cold" | "lite";
     }>;
     getPublicDataLink(input: RouterInputs['cloud']['dataLink']): Promise<{
-        name: string;
         id: string;
-        createdByUserId: string | null;
-        createdByAppId: string | null;
-        createdByOrgId: string | null;
+        name: string;
         slug: string;
         expireAt: Date | null;
         dataId: string;
+        createdByUserId: string | null;
+        createdByOrgId: string | null;
+        createdByAppId: string | null;
     }>;
     getPublicDataLinks(input: RouterInputs['cloud']['dataLinks']): Promise<{
-        name: string;
         id: string;
-        createdByUserId: string | null;
-        createdByAppId: string | null;
-        createdByOrgId: string | null;
+        name: string;
         slug: string;
         expireAt: Date | null;
         dataId: string;
+        createdByUserId: string | null;
+        createdByOrgId: string | null;
+        createdByAppId: string | null;
     }[]>;
     checkAccesses(input: RouterInputs['cloud']['checkAccesses']): Promise<{
         isMatching: true;
     } | {
+        isMatching: false;
         details: {
             missingNodeAccesses: {
                 userId: string;
@@ -133,61 +134,60 @@ export declare class SecrecyCloudClient {
             }[];
             missingDataAccesses: {
                 userId: string;
-                dataId: string;
                 nodeId: string;
+                dataId: string;
             }[];
             invalidRightsAccesses: {
                 userId: string;
-                current: {
-                    rights: "delete" | "write" | "read";
-                } & {
-                    addAccess?: "delete" | "write" | "read" | null | undefined;
-                    sharingAddAccess?: "delete" | "write" | "read" | null | undefined;
-                    delAccess?: "delete" | "write" | "read" | null | undefined;
-                    sharingDelAccess?: "delete" | "write" | "read" | null | undefined;
-                };
                 nodeId: string;
                 expect: {
-                    rights: "delete" | "write" | "read";
+                    rights: "delete" | "read" | "write";
+                } & {
+                    addAccess?: "delete" | "read" | "write" | null | undefined;
+                    sharingAddAccess?: "delete" | "read" | "write" | null | undefined;
+                    delAccess?: "delete" | "read" | "write" | null | undefined;
+                    sharingDelAccess?: "delete" | "read" | "write" | null | undefined;
+                };
+                current: {
+                    rights: "delete" | "read" | "write";
                 } & {
-                    addAccess?: "delete" | "write" | "read" | null | undefined;
-                    sharingAddAccess?: "delete" | "write" | "read" | null | undefined;
-                    delAccess?: "delete" | "write" | "read" | null | undefined;
-                    sharingDelAccess?: "delete" | "write" | "read" | null | undefined;
+                    addAccess?: "delete" | "read" | "write" | null | undefined;
+                    sharingAddAccess?: "delete" | "read" | "write" | null | undefined;
+                    delAccess?: "delete" | "read" | "write" | null | undefined;
+                    sharingDelAccess?: "delete" | "read" | "write" | null | undefined;
                 };
             }[];
         };
-        isMatching: false;
     }>;
     createPublicDataLink(input: RouterInputs['cloud']['createDataLink']): Promise<{
-        name: string;
         id: string;
-        createdByUserId: string | null;
-        createdByAppId: string | null;
-        createdByOrgId: string | null;
+        name: string;
         slug: string;
         expireAt: Date | null;
         dataId: string;
+        createdByUserId: string | null;
+        createdByOrgId: string | null;
+        createdByAppId: string | null;
     }>;
     updatePublicDataLink(input: RouterInputs['cloud']['updateDataLink']): Promise<{
-        name: string;
         id: string;
-        createdByUserId: string | null;
-        createdByAppId: string | null;
-        createdByOrgId: string | null;
+        name: string;
         slug: string;
         expireAt: Date | null;
         dataId: string;
+        createdByUserId: string | null;
+        createdByOrgId: string | null;
+        createdByAppId: string | null;
     }>;
     deletePublicDataLink(input: RouterInputs['cloud']['deleteDataLink']): Promise<{
-        name: string;
         id: string;
-        createdByUserId: string | null;
-        createdByAppId: string | null;
-        createdByOrgId: string | null;
+        name: string;
         slug: string;
         expireAt: Date | null;
         dataId: string;
+        createdByUserId: string | null;
+        createdByOrgId: string | null;
+        createdByAppId: string | null;
     }>;
     private _handleDataContent;
 }

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

@@ -1,5 +1,5 @@
 import { BaseClient, type SecrecyUrls } from '../base-client.js';
-import type { Progress } from '../crypto/data.js';
+import type { SecretStreamProgress } from '../crypto/data.js';
 import { SecrecyCloudClient } from './SecrecyCloudClient.js';
 import { SecrecyMailClient } from './SecrecyMailClient.js';
 import { SecrecyAppClient } from './SecrecyAppClient.js';
@@ -12,7 +12,7 @@ import { SecrecyUserClient } from './SecrecyUserClient.js';
 import { SecrecyPseudonymClient } from './SecrecyPseudonymClient.js';
 import { SecrecyOrganizationClient } from './SecrecyOrganizationClient.js';
 export type NewMail = Pick<RouterInputs['mail']['createDraft'], 'body' | 'subject' | 'senderFiles' | 'recipients' | 'replyToId'>;
-export type ProgressCallback = (progress: Progress) => Promise<void>;
+export type ProgressCallback = (progress: SecretStreamProgress) => Promise<void>;
 export interface SecrecyClientOptions {
     uaSession: string;
     uaKeys: KeyPair;

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

@@ -7,7 +7,7 @@ export type LocalData = {
     storageType: DataStorageType;
     size: bigint;
     sizeEncrypted: bigint | null;
-    data: Uint8Array;
+    data: Uint8Array<ArrayBuffer>;
     mime?: string;
     ext?: string;
 };

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

@@ -7,40 +7,14 @@ export type * from './user.js';
 declare const keyPair: z.ZodObject<{
     publicKey: z.ZodString;
     privateKey: z.ZodString;
-}, "strict", z.ZodTypeAny, {
-    publicKey: string;
-    privateKey: string;
-}, {
-    publicKey: string;
-    privateKey: string;
-}>;
+}, z.core.$strict>;
 export type KeyPair = z.infer<typeof keyPair>;
 export declare const secrecyUserApp: z.ZodReadonly<z.ZodObject<{
     keys: z.ZodObject<{
         publicKey: z.ZodString;
         privateKey: z.ZodString;
-    }, "strict", z.ZodTypeAny, {
-        publicKey: string;
-        privateKey: string;
-    }, {
-        publicKey: string;
-        privateKey: string;
-    }>;
+    }, z.core.$strict>;
     jwt: z.ZodString;
     uaSession: z.ZodString;
-}, "strict", z.ZodTypeAny, {
-    keys: {
-        publicKey: string;
-        privateKey: string;
-    };
-    jwt: string;
-    uaSession: string;
-}, {
-    keys: {
-        publicKey: string;
-        privateKey: string;
-    };
-    jwt: string;
-    uaSession: string;
-}>>;
+}, z.core.$strict>>;
 export type SecrecyUserApp = z.infer<typeof secrecyUserApp>;