@secrecy/lib 1.64.1-feat-share-up-to.1 → 1.65.0-feat-next15.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';
@@ -185,7 +184,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,
@@ -201,12 +200,13 @@ export class SecrecyCloudClient {
                 for (const [key, value] of Object.entries(part.fields)) {
                     formData.append(key, value);
                 }
-                formData.append('file', new Blob([chunk.data], { type: filetype?.mime }), `${uploadData.id}-${chunk.order}`);
-                await axios.post(part.url, formData, {
+                formData.append('file', new Blob([chunk.data.slice(0)], { type: filetype?.mime }), `${uploadData.id}-${chunk.order}`);
+                await ky.post(part.url, {
+                    signal,
+                    body: formData,
                     onUploadProgress: (progressEvent) => {
                         onProgress(part.order, progressEvent);
                     },
-                    signal,
                 });
                 return uploadDataPartEnd(chunk.md5, chunk.order);
             };
@@ -308,7 +308,11 @@ export class SecrecyCloudClient {
             await this.shareNode(users.map(([user, permissions]) => ({
                 userId: user.id,
                 nodeId: folder.id,
-                permissions,
+                rights: permissions.rights,
+                addAccess: permissions.addAccess,
+                delAccess: permissions.delAccess,
+                sharingAddAccess: permissions.sharingAddAccess,
+                sharingDelAccess: permissions.sharingDelAccess,
             })));
         }
         return folder;
@@ -355,21 +359,49 @@ export class SecrecyCloudClient {
                 .filter((entry) => entry !== null));
             const infos = await this.encryptNodesForUsers(nodesToEncrypt, publicKeysMap);
             const shares = Array.isArray(input)
-                ? input
+                ? input.map((opt) => ({
+                    nodeId: opt.nodeId,
+                    userId: opt.userId,
+                    permissions: {
+                        rights: opt.rights,
+                        addAccess: opt.addAccess,
+                        delAccess: opt.delAccess,
+                        sharingAddAccess: opt.sharingAddAccess,
+                        sharingDelAccess: opt.sharingDelAccess,
+                    },
+                }))
                 : 'userIds' in input
                     ? 'nodeIds' in input
                         ? input.userIds.flatMap((userId) => input.nodeIds.map((nodeId) => ({
-                            permissions: input.permissions,
+                            permissions: {
+                                rights: input.rights,
+                                addAccess: input.addAccess,
+                                delAccess: input.delAccess,
+                                sharingAddAccess: input.sharingAddAccess,
+                                sharingDelAccess: input.sharingDelAccess,
+                            },
                             userId,
                             nodeId,
                         })))
                         : input.userIds.map((userId) => ({
-                            permissions: input.permissions,
+                            permissions: {
+                                rights: input.rights,
+                                addAccess: input.addAccess,
+                                delAccess: input.delAccess,
+                                sharingAddAccess: input.sharingAddAccess,
+                                sharingDelAccess: input.sharingDelAccess,
+                            },
                             userId,
                             nodeId: input.nodeId,
                         }))
                     : input.nodeIds.map((nodeId) => ({
-                        permissions: input.permissions,
+                        permissions: {
+                            rights: input.rights,
+                            addAccess: input.addAccess,
+                            delAccess: input.delAccess,
+                            sharingAddAccess: input.sharingAddAccess,
+                            sharingDelAccess: input.sharingDelAccess,
+                        },
                         nodeId,
                         userId: input.userId,
                     }));
@@ -380,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 permissions!');
+                        throw new Error('Unable to retrieve rights!');
                     }
                     return {
                         nodeId: node.nodeId,
@@ -389,15 +421,15 @@ export class SecrecyCloudClient {
                     };
                 }),
             ]));
-            const withKeys = Object.fromEntries(Object.entries(infos).map('permissions' in input
+            const withKeys = Object.fromEntries(Object.entries(infos).map('rights' in input
                 ? ([userId, nodes]) => [
                     userId,
-                    { userId, nodes, permissions: input.permissions },
+                    { userId, nodes, permissions: input },
                 ]
                 : ([userId, nodes]) => {
                     const share = shares.find((share) => share.userId === userId && share.nodeId === nodes[0].id);
                     if (!share) {
-                        throw new Error('Unable to retrieve permissions!');
+                        throw new Error('Unable to retrieve rights!');
                     }
                     return [
                         userId,
@@ -410,7 +442,7 @@ export class SecrecyCloudClient {
                     userId,
                     nodes: nodes.nodes.map((node) => ({
                         id: node.id,
-                        permissions: nodes.permissions,
+                        ...nodes.permissions,
                         nameKey: node.nameKey,
                         data: node.data.map((d) => ({
                             id: d.id,
@@ -425,8 +457,8 @@ export class SecrecyCloudClient {
                     nodes: [
                         {
                             id: node.nodeId,
-                            permissions: node.permissions,
                             data: [],
+                            ...node.permissions,
                         },
                     ],
                 })));
@@ -653,15 +685,15 @@ export class SecrecyCloudClient {
         });
         const node = await apiNodeToExternalNodeFull(saveInCloud, this.#keys);
         const me = node.parent?.users.find(([u]) => u.id === this.#client.app.userId);
-        // TODO: ??
-        if (me !== undefined && ['delete', 'write'].includes(me[1].rights)) {
+        // TODO: Rights
+        if (me !== undefined && ['admin', '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,
                 })));
             }
         }

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

@@ -25,7 +25,6 @@ async function apiNodeToInternal(apiNode, keyPair) {
         parentId: apiNode.parentId ?? null,
         currentDataId: apiNode.currentDataId ?? null,
     };
-    internal.access = { ...apiNode.access };
     if (apiNode.access.nameKey !== null) {
         const key = decryptCryptoBox(sodium.from_hex(apiNode.access.nameKey), apiNode.access.sharedByPubKey, keyPair.privateKey);
         internal.name = sodium.to_string(await decryptSecretStream(key, sodium.from_hex(internal.name)));
@@ -67,8 +66,8 @@ function internalNodeToNode(internal) {
         })),
         access: {
             isRoot: internal.access.isRoot,
+            rights: internal.access.rights,
             sharedByPubKey: internal.access.sharedByPubKey,
-            permissions: internal.access.permissions,
         },
     };
     return node;

package/dist/lib/client.js

@@ -1,4 +1,4 @@
-import { httpBatchLink, loggerLink, createTRPCProxyClient, TRPCClientError, } from '@trpc/client';
+import { httpBatchLink, loggerLink, createTRPCClient as innerCreateTRPCClient, TRPCClientError, } from '@trpc/client';
 import superjson from 'superjson';
 import { SECRECY_LIB_VERSION } from './versioning.js';
 export function isTRPCClientError(cause) {
@@ -9,8 +9,7 @@ superjson.registerCustom({
     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 +23,7 @@ export const createTRPCClient = (opts) => createTRPCProxyClient({
             },
         }),
         httpBatchLink({
+            transformer: superjson,
             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, {
-    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;
@@ -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,22 +104,23 @@ export declare class SecrecyCloudClient {
         toType: "s3" | "cold" | "lite";
     }>;
     getPublicDataLink(input: RouterInputs['cloud']['dataLink']): Promise<{
-        name: string;
         id: string;
-        dataId: string;
-        expireAt: Date | null;
+        name: string;
         slug: string;
+        expireAt: Date | null;
+        dataId: string;
     }>;
     getPublicDataLinks(input: RouterInputs['cloud']['dataLinks']): Promise<{
-        name: string;
         id: string;
-        dataId: string;
-        expireAt: Date | null;
+        name: string;
         slug: string;
+        expireAt: Date | null;
+        dataId: string;
     }[]>;
     checkAccesses(input: RouterInputs['cloud']['checkAccesses']): Promise<{
         isMatching: true;
     } | {
+        isMatching: false;
         details: {
             missingNodeAccesses: {
                 userId: string;
@@ -127,50 +128,51 @@ 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;
-                    sharingAddAccess: "delete" | "write" | "read" | null;
-                    delAccess: "delete" | "write" | "read" | null;
-                    sharingDelAccess: "delete" | "write" | "read" | null;
-                };
                 nodeId: string;
                 expect: {
-                    rights: "delete" | "write" | "read";
-                    addAccess: "delete" | "write" | "read" | null;
-                    sharingAddAccess: "delete" | "write" | "read" | null;
-                    delAccess: "delete" | "write" | "read" | null;
-                    sharingDelAccess: "delete" | "write" | "read" | null;
+                    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" | "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;
-        dataId: string;
-        expireAt: Date | null;
+        name: string;
         slug: string;
+        expireAt: Date | null;
+        dataId: string;
     }>;
     updatePublicDataLink(input: RouterInputs['cloud']['updateDataLink']): Promise<{
-        name: string;
         id: string;
-        dataId: string;
-        expireAt: Date | null;
+        name: string;
         slug: string;
+        expireAt: Date | null;
+        dataId: string;
     }>;
     deletePublicDataLink(input: RouterInputs['cloud']['deleteDataLink']): Promise<{
-        name: string;
         id: string;
-        dataId: string;
-        expireAt: Date | null;
+        name: string;
         slug: string;
+        expireAt: Date | null;
+        dataId: string;
     }>;
     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';
@@ -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: Progress) => Promise<void>;
+export type ProgressCallback = (progress: SecretStreamProgress) => Promise<void>;
 export interface SecrecyClientOptions {
     uaSession: string;
     uaKeys: KeyPair;

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>;

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

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