@secrecy/lib 1.83.3 → 1.84.0

package/dist/lib/client/data-link.js

@@ -28,15 +28,17 @@ export const downloadDataLinkSchema = z.union([
     downloadDataLinkS3Schema,
     downloadDataLinkLiteSchema,
 ]);
-// TODO: Add an opt header for authed users!
-export async function downloadDataFromLink(opts) {
-    let dataUrl = opts.dataUrl ?? 'https://data.secrecy.tech/';
-    dataUrl = dataUrl.endsWith('/') ? dataUrl : `${dataUrl}/`;
-    const rawDataLinkRes = await fetch(`${dataUrl}${opts.dataLinkSlug}/json`, {
-        credentials: 'include',
+export async function fetchDataLinkMetadata(dataLinkSlug, dataUrl) {
+    let baseUrl = dataUrl ?? 'https://data.secrecy.tech/';
+    baseUrl = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
+    const rawDataLinkRes = await fetch(`${baseUrl}${dataLinkSlug}/json`, {
+    // ! disable cookies for now
+    // credentials: 'include',
     }).catch((err) => {
         console.error(err);
-        throw new Error(`Unable to fetch "${`${dataUrl}${opts.dataLinkSlug}/json"`}`, { cause: err });
+        throw new Error(`Unable to fetch "${`${baseUrl}${dataLinkSlug}/json"`}`, {
+            cause: err,
+        });
     });
     const rawDataLink = await rawDataLinkRes.json().catch((err) => {
         console.error(err);
@@ -46,28 +48,33 @@ export async function downloadDataFromLink(opts) {
     if (dataLink.error) {
         throw new Error(`Should not happen!`, { cause: dataLink.error });
     }
-    if (dataLink.data.isEncrypted && !opts.crypto) {
+    return dataLink.data;
+}
+// TODO: Add an opt header for authed users!
+export async function downloadDataFromLink(opts) {
+    const dataLink = await fetchDataLinkMetadata(opts.dataLinkSlug, opts.dataUrl);
+    if (dataLink.isEncrypted && !opts.crypto) {
         throw new Error('Unable to read encrypted data without password!');
     }
     const bytes = await buildBytesFromDataLink({
-        dataLink: dataLink.data,
-        totalBytes: Number(dataLink.data.size),
+        dataLink: dataLink,
+        totalBytes: Number(dataLink.size),
         signal: opts.signal,
         onDownloadProgress: opts.downloadProgress,
     });
-    if (!dataLink.data.isEncrypted) {
+    if (!dataLink.isEncrypted) {
         return bytes;
     }
     if (!opts.crypto) {
         throw new Error('Unable to read encrypted data without password!');
     }
     try {
-        const salt = sodium.crypto_generichash(sodium.crypto_pwhash_SALTBYTES, opts.crypto.password + dataLink.data.md5);
+        const salt = sodium.crypto_generichash(sodium.crypto_pwhash_SALTBYTES, opts.crypto.password + dataLink.md5);
         const derivedPassword = derivePassword(opts.crypto.password, salt);
         const decryptedSharingDataKey = decryptSecretBox(sodium.from_hex(opts.crypto.key), derivedPassword);
         const decryptedBytes = await decrypt(decryptedSharingDataKey, bytes, opts.decryptProgress, opts.signal);
         const md5Content = await md5(decryptedBytes);
-        if (md5Content !== dataLink.data.md5) {
+        if (md5Content !== dataLink.md5) {
             throw new Error(`Content does not match`);
         }
         return decompress(decryptedBytes);

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

@@ -32,6 +32,27 @@ export type DownloadDataFromLinkOptions = {
     downloadProgress?: (progress: Progress) => void;
     signal?: AbortSignal;
 };
+export declare function fetchDataLinkMetadata(dataLinkSlug: string, dataUrl?: string): Promise<{
+    name: string;
+    md5: string;
+    md5Encrypted: string | null;
+    size: bigint;
+    parts: {
+        order: number;
+        md5: string;
+        contentUrl: string;
+    }[];
+    mime: string;
+    isEncrypted: boolean;
+} | {
+    name: string;
+    md5: string;
+    md5Encrypted: string | null;
+    size: bigint;
+    bytes: string;
+    mime: string;
+    isEncrypted: boolean;
+}>;
 export declare function downloadDataFromLink(opts: DownloadDataFromLinkOptions & {
     dataUrl?: string;
 }): Promise<Uint8Array<ArrayBuffer>>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.83.3",
+  "version": "1.84.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"