@secrecy/lib 1.62.1-feat-next15.1 → 1.62.1-feat-orgs.2

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,
@@ -201,12 +202,11 @@ 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,
+                await axios.post(part.url, formData, {
                     onUploadProgress: (progressEvent) => {
                         onProgress(part.order, progressEvent);
                     },
+                    signal,
                 });
                 return uploadDataPartEnd(chunk.md5, chunk.order);
             };

package/dist/lib/client.js

@@ -1,4 +1,4 @@
-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';
 export function isTRPCClientError(cause) {
@@ -9,7 +9,8 @@ superjson.registerCustom({
     serialize: (v) => [...v],
     deserialize: (v) => Buffer.from(v),
 }, 'buffer');
-export const createTRPCClient = (opts) => innerCreateTRPCClient({
+export const createTRPCClient = (opts) => createTRPCProxyClient({
+    transformer: superjson,
     links: [
         loggerLink({
             enabled: (op) => {
@@ -23,7 +24,6 @@ export const createTRPCClient = (opts) => innerCreateTRPCClient({
             },
         }),
         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, {
-    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;
+        id: string;
         dataId: string;
-        slug: string;
         expireAt: Date | null;
+        slug: string;
     }>;
     getPublicDataLinks(input: RouterInputs['cloud']['dataLinks']): Promise<{
-        id: string;
         name: string;
+        id: string;
         dataId: string;
-        slug: string;
         expireAt: Date | null;
+        slug: string;
     }[]>;
     checkAccesses(input: RouterInputs['cloud']['checkAccesses']): Promise<{
         isMatching: true;
     } | {
-        isMatching: false;
         details: {
             missingNodeAccesses: {
                 userId: string;
@@ -133,32 +132,33 @@ export declare class SecrecyCloudClient {
             }[];
             invalidRightsAccesses: {
                 userId: string;
-                nodeId: string;
                 current: "admin" | "write" | "read";
+                nodeId: string;
                 expect: "admin" | "write" | "read";
             }[];
         };
+        isMatching: false;
     }>;
     createPublicDataLink(input: RouterInputs['cloud']['createDataLink']): Promise<{
-        id: string;
         name: string;
+        id: string;
         dataId: string;
-        slug: string;
         expireAt: Date | null;
+        slug: string;
     }>;
     updatePublicDataLink(input: RouterInputs['cloud']['updateDataLink']): Promise<{
-        id: string;
         name: string;
+        id: string;
         dataId: string;
-        slug: string;
         expireAt: Date | null;
+        slug: string;
     }>;
     deletePublicDataLink(input: RouterInputs['cloud']['deleteDataLink']): Promise<{
-        id: string;
         name: string;
+        id: string;
         dataId: string;
-        slug: 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

@@ -29,18 +29,18 @@ export declare const secrecyUserApp: z.ZodReadonly<z.ZodObject<{
     jwt: z.ZodString;
     uaSession: z.ZodString;
 }, "strict", z.ZodTypeAny, {
-    jwt: string;
     keys: {
         publicKey: string;
         privateKey: string;
     };
+    jwt: string;
     uaSession: string;
 }, {
-    jwt: string;
     keys: {
         publicKey: string;
         privateKey: string;
     };
+    jwt: string;
     uaSession: string;
 }>>;
 export type SecrecyUserApp = z.infer<typeof secrecyUserApp>;