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

package/dist/lib/client/SecrecyCloudClient.js

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import ky from 'ky';
 import { nodesCache, dataCache, dataContentCache, nodesEncryptionCache, } from '../cache.js';
 import { secretStreamKeygen } from '../crypto/data.js';
@@ -184,7 +185,7 @@ export class SecrecyCloudClient {
             const progressParts = {};
             const onProgress = (part, progressEvent) => {
                 progressParts[part] = progressEvent;
-                const current = Object.values(progressParts).reduce((prv, cur) => prv + cur.transferredBytes, 0);
+                const current = Object.values(progressParts).reduce((prv, cur) => prv + cur.loaded, 0);
                 void uploadProgress?.({
                     percent: current / encryptedData.byteLength,
                     total: encryptedData.byteLength,
@@ -200,13 +201,12 @@ export class SecrecyCloudClient {
                 for (const [key, value] of Object.entries(part.fields)) {
                     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, {
-                    signal,
-                    body: formData,
+                formData.append('file', new Blob([chunk.data], { type: filetype?.mime }), `${uploadData.id}-${chunk.order}`);
+                await axios.post(part.url, formData, {
                     onUploadProgress: (progressEvent) => {
                         onProgress(part.order, progressEvent);
                     },
+                    signal,
                 });
                 return uploadDataPartEnd(chunk.md5, chunk.order);
             };
@@ -412,7 +412,7 @@ export class SecrecyCloudClient {
                     .map((node) => {
                     const share = shares.find((share) => share.nodeId === node.nodeId && share.userId === userId);
                     if (!share) {
-                        throw new Error('Unable to retrieve rights!');
+                        throw new Error('Unable to retrieve permissions!');
                     }
                     return {
                         nodeId: node.nodeId,
@@ -424,12 +424,22 @@ export class SecrecyCloudClient {
             const withKeys = Object.fromEntries(Object.entries(infos).map('rights' in input
                 ? ([userId, nodes]) => [
                     userId,
-                    { userId, nodes, permissions: input },
+                    {
+                        userId,
+                        nodes,
+                        permissions: {
+                            rights: input.rights,
+                            addAccess: input.addAccess,
+                            delAccess: input.delAccess,
+                            sharingAddAccess: input.sharingAddAccess,
+                            sharingDelAccess: input.sharingDelAccess,
+                        },
+                    },
                 ]
                 : ([userId, nodes]) => {
                     const share = shares.find((share) => share.userId === userId && share.nodeId === nodes[0].id);
                     if (!share) {
-                        throw new Error('Unable to retrieve rights!');
+                        throw new Error('Unable to retrieve permissions!');
                     }
                     return [
                         userId,
@@ -442,12 +452,12 @@ export class SecrecyCloudClient {
                     userId,
                     nodes: nodes.nodes.map((node) => ({
                         id: node.id,
-                        ...nodes.permissions,
                         nameKey: node.nameKey,
                         data: node.data.map((d) => ({
                             id: d.id,
                             key: d.key,
                         })),
+                        ...nodes.permissions,
                     })),
                 });
             }
@@ -685,13 +695,14 @@ export class SecrecyCloudClient {
         });
         const node = await apiNodeToExternalNodeFull(saveInCloud, this.#keys);
         const me = node.parent?.users.find(([u]) => u.id === this.#client.app.userId);
-        // TODO: Rights
-        if (me !== undefined && ['admin', 'write'].includes(me[1]['rights'])) {
+        // TODO: ??
+        if (me !== undefined && ['delete', 'write'].includes(me[1].rights)) {
             const others = node.parent?.users.filter(([u]) => u.id !== this.#client.app.userId) ??
                 [];
             if (others.length > 0) {
                 await this.shareNode(others.map(([user, permissions]) => ({
                     userId: user.id,
+                    permissions,
                     nodeId: node.id,
                     ...permissions,
                 })));
@@ -715,9 +726,7 @@ export class SecrecyCloudClient {
         }
         // Retrieve and format nodes.
         for (const nodeId of nodeIds) {
-            let node;
-            node ??= nodesEncryptionCache.get(nodeId);
-            node ??= nodesCache.get(nodeId);
+            let node = nodesEncryptionCache.get(nodeId) ?? nodesCache.get(nodeId);
             if (node &&
                 'history' in node &&
                 node.history.length > 0 &&

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

@@ -66,8 +66,12 @@ function internalNodeToNode(internal) {
         })),
         access: {
             isRoot: internal.access.isRoot,
-            rights: internal.access.rights,
             sharedByPubKey: internal.access.sharedByPubKey,
+            rights: internal.access.rights,
+            addAccess: internal.access.addAccess,
+            delAccess: internal.access.delAccess,
+            sharingAddAccess: internal.access.sharingAddAccess,
+            sharingDelAccess: internal.access.sharingDelAccess,
         },
     };
     return node;

package/dist/lib/client.js

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

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, {
-    firstname: string;
-    lastname: string;
     id: string;
+    lastname: string;
+    firstname: 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 Progress } from '../types.js';
+import { type DownloadProgress } from '../types.js';
 import { FileTypeResult } from 'file-type';
 export declare class SecrecyCloudClient {
     #private;
@@ -63,13 +63,13 @@ export declare class SecrecyCloudClient {
     }): Promise<NodeFull>;
     dataContent({ dataId, onDownloadProgress, progressDecrypt, signal, }: {
         dataId: string;
-        onDownloadProgress?: (progress: Progress) => void;
+        onDownloadProgress?: (progress: DownloadProgress) => void;
         progressDecrypt?: ProgressCallback;
         signal?: AbortSignal;
     }): Promise<LocalData>;
     dataContents({ dataIds, onDownloadProgress, progressDecrypt, signal, }: {
         dataIds: string[];
-        onDownloadProgress?: (progress: Progress) => void;
+        onDownloadProgress?: (progress: DownloadProgress) => void;
         progressDecrypt?: ProgressCallback;
         signal?: AbortSignal;
     }): Promise<LocalData[]>;
@@ -104,23 +104,22 @@ export declare class SecrecyCloudClient {
         toType: "s3" | "cold" | "lite";
     }>;
     getPublicDataLink(input: RouterInputs['cloud']['dataLink']): Promise<{
-        id: string;
         name: string;
-        slug: string;
-        expireAt: Date | null;
+        id: string;
         dataId: string;
+        expireAt: Date | null;
+        slug: string;
     }>;
     getPublicDataLinks(input: RouterInputs['cloud']['dataLinks']): Promise<{
-        id: string;
         name: string;
-        slug: string;
-        expireAt: Date | null;
+        id: string;
         dataId: string;
+        expireAt: Date | null;
+        slug: string;
     }[]>;
     checkAccesses(input: RouterInputs['cloud']['checkAccesses']): Promise<{
         isMatching: true;
     } | {
-        isMatching: false;
         details: {
             missingNodeAccesses: {
                 userId: string;
@@ -128,51 +127,52 @@ export declare class SecrecyCloudClient {
             }[];
             missingDataAccesses: {
                 userId: string;
-                nodeId: string;
                 dataId: string;
+                nodeId: string;
             }[];
             invalidRightsAccesses: {
                 userId: string;
-                nodeId: string;
-                expect: {
-                    rights: "delete" | "read" | "write";
+                current: {
+                    rights: "delete" | "write" | "read";
                 } & {
-                    addAccess?: "delete" | "read" | "write" | null | undefined;
-                    sharingAddAccess?: "delete" | "read" | "write" | null | undefined;
-                    delAccess?: "delete" | "read" | "write" | null | undefined;
-                    sharingDelAccess?: "delete" | "read" | "write" | null | undefined;
+                    addAccess?: "delete" | "write" | "read" | null | undefined;
+                    sharingAddAccess?: "delete" | "write" | "read" | null | undefined;
+                    delAccess?: "delete" | "write" | "read" | null | undefined;
+                    sharingDelAccess?: "delete" | "write" | "read" | null | undefined;
                 };
-                current: {
-                    rights: "delete" | "read" | "write";
+                nodeId: string;
+                expect: {
+                    rights: "delete" | "write" | "read";
                 } & {
-                    addAccess?: "delete" | "read" | "write" | null | undefined;
-                    sharingAddAccess?: "delete" | "read" | "write" | null | undefined;
-                    delAccess?: "delete" | "read" | "write" | null | undefined;
-                    sharingDelAccess?: "delete" | "read" | "write" | null | undefined;
+                    addAccess?: "delete" | "write" | "read" | null | undefined;
+                    sharingAddAccess?: "delete" | "write" | "read" | null | undefined;
+                    delAccess?: "delete" | "write" | "read" | null | undefined;
+                    sharingDelAccess?: "delete" | "write" | "read" | null | undefined;
                 };
             }[];
         };
+        isMatching: false;
     }>;
     createPublicDataLink(input: RouterInputs['cloud']['createDataLink']): Promise<{
-        id: string;
         name: string;
-        slug: string;
-        expireAt: Date | null;
+        id: string;
         dataId: string;
+        expireAt: Date | null;
+        slug: string;
     }>;
     updatePublicDataLink(input: RouterInputs['cloud']['updateDataLink']): Promise<{
-        id: string;
         name: string;
-        slug: string;
-        expireAt: Date | null;
+        id: string;
         dataId: string;
+        expireAt: Date | null;
+        slug: string;
     }>;
     deletePublicDataLink(input: RouterInputs['cloud']['deleteDataLink']): Promise<{
-        id: string;
         name: string;
-        slug: string;
-        expireAt: Date | null;
+        id: string;
         dataId: string;
+        expireAt: Date | null;
+        slug: string;
     }>;
     private _handleDataContent;
 }

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

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

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

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

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

@@ -1,8 +1,8 @@
 import { type RouterOutputs } from '../../client.js';
 import type { DataMetadata, InternalData, PublicUser } from './index.js';
-export type NodePermissions = ApiNode['users'][number][1];
-export type Rights = NodePermissions['rights'];
-export type NodeAccess<T extends Record<string, unknown> = Record<string, unknown>> = T & NodePermissions & {
+export type Permissions = ApiNode['users'][number][1];
+export type Rights = Permissions['rights'];
+export type NodeAccess<T extends Record<string, unknown> = Record<string, unknown>> = T & Permissions & {
     isRoot: boolean;
     sharedByPubKey: string;
 };
@@ -33,7 +33,7 @@ export interface Node<T extends NodeBreadcrumbItem = NodeBreadcrumbItem, U exten
     breadcrumb: T[];
     owner: PublicUser;
     access: NodeAccess<U>;
-    users: Array<[PublicUser, NodePermissions]>;
+    users: Array<[PublicUser, Permissions]>;
     currentDataId: string | null;
     parentId: string | null;
 }
@@ -82,9 +82,9 @@ export type ShareNodeDetails = {
     }[];
     invalidRightsAccesses: {
         userId: string;
-        current: NodePermissions;
+        current: Permissions;
         nodeId: string;
-        expect: NodePermissions;
+        expect: Permissions;
     }[];
 };
 export {};