deeplake 0.3.5 → 0.3.6

package/dist/browser/browser/storage.d.ts

@@ -1,11 +1,8 @@
 /**
  * Browser storage client factory for the WASM deeplake engine.
  *
- * Creates a JS client object with methods (download, exists, list, metadata,
- * remove, saveWithCompletion, copyGetter, copyWriter, generateGetPresignedUrl)
- * that the C++ js_storage layer calls via EM_JS wrappers.
- *
- * Uses fetch() for all S3 operations — no AWS SDK dependency in the browser.
+ * Uses @aws-sdk/client-s3 for all S3 operations — handles SigV4 signing,
+ * retries, and edge cases automatically.
  */
 export declare function createBrowserStorageFactory(wasmMod?: any): (type: string, config?: any, _mode?: string) => {
     download(url: string, range: string, index: number, _callback: any): void;

package/dist/browser/browser/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/browser/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA2TH,wBAAgB,2BAA2B,CAAC,OAAO,CAAC,EAAE,GAAG,IAC/B,MAAM,MAAM,EAAE,SAAS,GAAG,EAAE,QAAQ,MAAM;kBA9LlD,MAAM,SAAS,MAAM,SAAS,MAAM,aAAa,GAAG;gBAsBtD,MAAM,aAAa,GAAG;mBAenB,MAAM,QAAQ,MAAM,aAAa,GAAG;eAyBxC,MAAM,UAAU,MAAM,cAAc,MAAM,aAAa,GAAG;mBAoFtD,MAAM,UAAU,MAAM,aAAa,GAAG;iCAKxB,MAAM,aAAa,GAAG;gBAMvC,MAAM,aAAa,GAAG;4BAQV,MAAM,QAAQ,UAAU,aAAa,GAAG;;;;cA0CnE"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/browser/storage.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoKH,wBAAgB,2BAA2B,CAAC,OAAO,CAAC,EAAE,GAAG,IAC/B,MAAM,MAAM,EAAE,SAAS,GAAG,EAAE,QAAQ,MAAM;kBAtHlD,MAAM,SAAS,MAAM,SAAS,MAAM,aAAa,GAAG;gBAyBtD,MAAM,aAAa,GAAG;mBAQnB,MAAM,QAAQ,MAAM,aAAa,GAAG;eAoBxC,MAAM,UAAU,MAAM,cAAc,MAAM,aAAa,GAAG;mBAsBtD,MAAM,UAAU,MAAM,aAAa,GAAG;iCAKxB,MAAM,aAAa,GAAG;gBAKvC,MAAM,aAAa,GAAG;4BAQV,MAAM,QAAQ,UAAU,aAAa,GAAG;;;;cAuCnE"}

package/dist/browser/browser/storage.js

@@ -1,14 +1,11 @@
 /**
  * Browser storage client factory for the WASM deeplake engine.
  *
- * Creates a JS client object with methods (download, exists, list, metadata,
- * remove, saveWithCompletion, copyGetter, copyWriter, generateGetPresignedUrl)
- * that the C++ js_storage layer calls via EM_JS wrappers.
- *
- * Uses fetch() for all S3 operations — no AWS SDK dependency in the browser.
+ * Uses @aws-sdk/client-s3 for all S3 operations — handles SigV4 signing,
+ * retries, and edge cases automatically.
  */
+import { S3Client, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, DeleteObjectCommand, PutObjectCommand, } from '@aws-sdk/client-s3';
 function parseS3Url(url) {
-    // s3://bucket/key or just bucket/key
     const clean = url.replace(/^s3:\/\//, '');
     const idx = clean.indexOf('/');
     if (idx === -1)
@@ -16,16 +13,13 @@ function parseS3Url(url) {
     return { bucket: clean.substring(0, idx), key: clean.substring(idx + 1) };
 }
 // Embind wraps std::function as an object with an invoke-like interface.
-// Normalize to a plain JS function.
 function asCallable(cb) {
     if (typeof cb === 'function')
         return cb;
-    // embind std::function wrapper — call it directly
     if (cb && typeof cb.opcall === 'function')
         return (arg) => cb.opcall(arg);
     if (cb && typeof cb.call === 'function')
         return (arg) => cb.call(arg);
-    // If it's an emval-wrapped function, try calling it directly
     return (arg) => { try {
         cb(arg);
     }
@@ -33,212 +27,83 @@ function asCallable(cb) {
 }
 function createBrowserStorageClient(config, wasmMod) {
     const region = config.region || 'us-east-1';
-    const endpoint = config.endpoint || `https://s3.${region}.amazonaws.com`;
-    const accessKeyId = config.aws_access_key_id;
-    const secretAccessKey = config.aws_secret_access_key;
-    const sessionToken = config.aws_session_token;
-    // AWS Signature V4 — header-based auth (simpler and more reliable than presigned URLs)
-    async function signedFetch(method, bucket, key, opts = {}) {
-        const host = `${bucket}.s3.${region}.amazonaws.com`;
-        const encodedKey = key.split('/').map(s => encodeURIComponent(s)).join('/');
-        const url = `https://${host}/${encodedKey}`;
-        const enc = new TextEncoder();
-        async function hmac(k, msg) {
-            const key = await crypto.subtle.importKey('raw', k, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']);
-            return crypto.subtle.sign('HMAC', key, enc.encode(msg));
-        }
-        function hex(buf) {
-            return Array.from(new Uint8Array(buf)).map(b => b.toString(16).padStart(2, '0')).join('');
-        }
-        async function sha256(data) {
-            const buf = typeof data === 'string' ? enc.encode(data) : data;
-            return hex(await crypto.subtle.digest('SHA-256', buf));
-        }
-        const now = new Date();
-        const dateStr = now.toISOString().replace(/[:-]|\.\d{3}/g, '').slice(0, 15) + 'Z';
-        const shortDate = dateStr.substring(0, 8);
-        const emptyHash = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
-        const payloadHash = opts.body ? await sha256(opts.body) : emptyHash;
-        const headers = {
-            'host': host,
-            'x-amz-content-sha256': payloadHash,
-            'x-amz-date': dateStr,
-        };
-        if (sessionToken) {
-            headers['x-amz-security-token'] = sessionToken;
-        }
-        if (opts.range) {
-            headers['range'] = opts.range;
-        }
-        const signedHeaderNames = Object.keys(headers).sort().join(';');
-        const canonicalHeaders = Object.keys(headers).sort()
-            .map(k => `${k}:${headers[k]}\n`).join('');
-        const canonicalRequest = [
-            method,
-            '/' + encodedKey,
-            '', // no query string
-            canonicalHeaders,
-            signedHeaderNames,
-            payloadHash,
-        ].join('\n');
-        const scope = `${shortDate}/${region}/s3/aws4_request`;
-        const stringToSign = [
-            'AWS4-HMAC-SHA256',
-            dateStr,
-            scope,
-            await sha256(canonicalRequest),
-        ].join('\n');
-        const seedKey = enc.encode('AWS4' + secretAccessKey);
-        let signingKey = await hmac(seedKey.buffer.slice(seedKey.byteOffset, seedKey.byteOffset + seedKey.byteLength), shortDate);
-        signingKey = await hmac(signingKey, region);
-        signingKey = await hmac(signingKey, 's3');
-        signingKey = await hmac(signingKey, 'aws4_request');
-        const signature = hex(await crypto.subtle.sign('HMAC', await crypto.subtle.importKey('raw', signingKey, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']), enc.encode(stringToSign)));
-        const authHeader = `AWS4-HMAC-SHA256 Credential=${accessKeyId}/${scope}, SignedHeaders=${signedHeaderNames}, Signature=${signature}`;
-        const fetchHeaders = {
-            ...headers,
-            'Authorization': authHeader,
-        };
-        delete fetchHeaders['host']; // browser sets Host automatically
-        const fetchOpts = { method, headers: fetchHeaders };
-        if (opts.body) {
-            fetchOpts.body = opts.body;
-        }
-        return fetch(url, fetchOpts);
-    }
+    const s3 = new S3Client({
+        region,
+        credentials: {
+            accessKeyId: config.aws_access_key_id.trim(),
+            secretAccessKey: config.aws_secret_access_key.trim(),
+            ...(config.aws_session_token ? { sessionToken: config.aws_session_token.trim() } : {}),
+        },
+    });
     const client = {
         download(url, range, index, _callback) {
             const callback = asCallable(_callback);
             const { bucket, key } = parseS3Url(url);
-            // C++ passes range as "bytes=0-32767" (already includes "bytes=" prefix)
             const rangeHeader = range && range.length > 0 ? range : undefined;
-            signedFetch('GET', bucket, key, { range: rangeHeader })
+            s3.send(new GetObjectCommand({
+                Bucket: bucket,
+                Key: key,
+                ...(rangeHeader ? { Range: rangeHeader } : {}),
+            }))
                 .then(async (resp) => {
-                if (!resp.ok) {
-                    callback({ responseCode: resp.status });
-                    return;
-                }
-                const data = await resp.arrayBuffer();
-                if (wasmMod?.provideResponseBuffer) {
-                    const buf = wasmMod.provideResponseBuffer(index, data.byteLength);
-                    buf.set(new Uint8Array(data));
+                const bytes = await resp.Body?.transformToByteArray();
+                if (bytes && wasmMod?.provideResponseBuffer) {
+                    const buf = wasmMod.provideResponseBuffer(index, bytes.byteLength);
+                    buf.set(bytes);
                 }
-                callback({ responseCode: resp.status });
+                callback({ responseCode: resp.$metadata.httpStatusCode ?? 200 });
             })
-                .catch(() => callback({ responseCode: 1000 }));
+                .catch((err) => {
+                const code = err.$metadata?.httpStatusCode ?? 1000;
+                console.error(`[deeplake-storage] download ${bucket}/${key} failed:`, err.message ?? err);
+                callback({ responseCode: code });
+            });
         },
         exists(url, _callback) {
             const callback = asCallable(_callback);
             const { bucket, key } = parseS3Url(url);
-            signedFetch('HEAD', bucket, key)
-                .then((resp) => {
-                if (!resp.ok) {
-                    callback(-1);
-                    return;
-                }
-                const len = parseInt(resp.headers.get('content-length') || '0', 10);
-                callback(len);
-            })
+            s3.send(new HeadObjectCommand({ Bucket: bucket, Key: key }))
+                .then((resp) => callback(resp.ContentLength ?? 0))
                 .catch(() => callback(-1));
         },
         metadata(root, path, _callback) {
             const callback = asCallable(_callback);
             const { bucket, key } = parseS3Url(root + path);
-            signedFetch('HEAD', bucket, key)
+            s3.send(new HeadObjectCommand({ Bucket: bucket, Key: key }))
                 .then((resp) => {
-                if (!resp.ok) {
-                    callback({ responseCode: resp.status });
-                    return;
-                }
-                const lastModified = new Date(resp.headers.get('last-modified') || '');
-                const size = parseInt(resp.headers.get('content-length') || '0', 10);
-                const etag = resp.headers.get('etag') || '';
                 callback({
                     responseCode: 200,
                     data: {
                         path: root + path,
-                        size,
-                        lastModified,
-                        etag,
+                        size: resp.ContentLength ?? 0,
+                        lastModified: resp.LastModified ?? new Date(),
+                        etag: (resp.ETag ?? '').replace(/"/g, ''),
                     },
                 });
             })
-                .catch(() => callback({ responseCode: 1000 }));
+                .catch((err) => {
+                callback({ responseCode: err.$metadata?.httpStatusCode ?? 1000 });
+            });
         },
         list(root, prefix, _delimiter, _callback) {
             const callback = asCallable(_callback);
             const { bucket } = parseS3Url(root);
-            // root is "bucket/path/to/dataset/", prefix is relative like "_deeplake_log/_meta/"
-            const rootKey = root.replace(/^[^/]+\//, ''); // strip bucket name
+            const rootKey = root.replace(/^[^/]+\//, '');
             const fullPrefix = rootKey + prefix;
-            // S3 ListObjectsV2 via signed GET with query params
-            const listUrl = `https://${bucket}.s3.${region}.amazonaws.com/?list-type=2&prefix=${encodeURIComponent(fullPrefix)}`;
-            const enc = new TextEncoder();
-            // Sign the list request
-            (async () => {
-                try {
-                    const now = new Date();
-                    const dateStr = now.toISOString().replace(/[:-]|\.\d{3}/g, '').slice(0, 15) + 'Z';
-                    const shortDate = dateStr.substring(0, 8);
-                    const emptyHash = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
-                    const host = `${bucket}.s3.${region}.amazonaws.com`;
-                    const headers = {
-                        'host': host,
-                        'x-amz-content-sha256': emptyHash,
-                        'x-amz-date': dateStr,
-                    };
-                    if (sessionToken)
-                        headers['x-amz-security-token'] = sessionToken;
-                    const signedHeaderNames = Object.keys(headers).sort().join(';');
-                    const canonicalHeaders = Object.keys(headers).sort().map(k => `${k}:${headers[k]}\n`).join('');
-                    const queryString = `list-type=2&prefix=${encodeURIComponent(fullPrefix)}`;
-                    async function hmacSign(k, msg) {
-                        const key = await crypto.subtle.importKey('raw', k, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']);
-                        return crypto.subtle.sign('HMAC', key, enc.encode(msg));
-                    }
-                    function hex(buf) {
-                        return Array.from(new Uint8Array(buf)).map(b => b.toString(16).padStart(2, '0')).join('');
-                    }
-                    async function sha256str(s) {
-                        return hex(await crypto.subtle.digest('SHA-256', enc.encode(s)));
-                    }
-                    const canonicalRequest = ['GET', '/', queryString, canonicalHeaders, signedHeaderNames, emptyHash].join('\n');
-                    const scope = `${shortDate}/${region}/s3/aws4_request`;
-                    const stringToSign = ['AWS4-HMAC-SHA256', dateStr, scope, await sha256str(canonicalRequest)].join('\n');
-                    const seedKey = enc.encode('AWS4' + secretAccessKey);
-                    let sigKey = await hmacSign(seedKey.buffer.slice(seedKey.byteOffset, seedKey.byteOffset + seedKey.byteLength), shortDate);
-                    sigKey = await hmacSign(sigKey, region);
-                    sigKey = await hmacSign(sigKey, 's3');
-                    sigKey = await hmacSign(sigKey, 'aws4_request');
-                    const signature = hex(await crypto.subtle.sign('HMAC', await crypto.subtle.importKey('raw', sigKey, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']), enc.encode(stringToSign)));
-                    const authHeader = `AWS4-HMAC-SHA256 Credential=${accessKeyId}/${scope}, SignedHeaders=${signedHeaderNames}, Signature=${signature}`;
-                    const fetchHeaders = { ...headers, 'Authorization': authHeader };
-                    delete fetchHeaders['host'];
-                    const resp = await fetch(listUrl, { headers: fetchHeaders });
-                    if (!resp.ok) {
-                        callback({ responseCode: resp.status, data: [] });
-                        return;
-                    }
-                    const xml = await resp.text();
-                    // Parse XML response for <Key>, <Size>, <LastModified>, <ETag>
-                    const entries = [];
-                    const regex = /<Contents>[\s\S]*?<Key>(.*?)<\/Key>[\s\S]*?<LastModified>(.*?)<\/LastModified>[\s\S]*?<ETag>(.*?)<\/ETag>[\s\S]*?<Size>(.*?)<\/Size>[\s\S]*?<\/Contents>/g;
-                    let match;
-                    while ((match = regex.exec(xml)) !== null) {
-                        const key = match[1].replace(rootKey, ''); // make relative to root
-                        entries.push({
-                            path: key,
-                            size: parseInt(match[4], 10),
-                            lastModified: new Date(match[2]),
-                            etag: match[3].replace(/"/g, ''),
-                        });
-                    }
-                    callback({ responseCode: 200, data: entries });
-                }
-                catch {
-                    callback({ responseCode: 1000, data: [] });
-                }
-            })();
+            s3.send(new ListObjectsV2Command({ Bucket: bucket, Prefix: fullPrefix }))
+                .then((resp) => {
+                const entries = (resp.Contents ?? []).map((item) => ({
+                    path: (item.Key ?? '').replace(rootKey, ''),
+                    size: item.Size ?? 0,
+                    lastModified: item.LastModified ?? new Date(),
+                    etag: (item.ETag ?? '').replace(/"/g, ''),
+                }));
+                callback({ responseCode: 200, data: entries });
+            })
+                .catch((err) => {
+                console.error(`[deeplake-storage] list ${bucket}/${fullPrefix} failed:`, err.message ?? err);
+                callback({ responseCode: err.$metadata?.httpStatusCode ?? 1000, data: [] });
+            });
         },
         listDirs(root, prefix, _callback) {
             const callback = asCallable(_callback);
@@ -246,21 +111,20 @@ function createBrowserStorageClient(config, wasmMod) {
         },
         generateGetPresignedUrl(url, _callback) {
             const callback = asCallable(_callback);
-            // Return the URL as-is for now
             callback(url);
         },
         remove(url, _callback) {
             const callback = asCallable(_callback);
             const { bucket, key } = parseS3Url(url);
-            signedFetch('DELETE', bucket, key)
-                .then((resp) => callback({ responseCode: resp.status }))
+            s3.send(new DeleteObjectCommand({ Bucket: bucket, Key: key }))
+                .then((resp) => callback({ responseCode: resp.$metadata.httpStatusCode ?? 200 }))
                 .catch(() => callback({ responseCode: 1000 }));
         },
         saveWithCompletion(url, data, _callback) {
             const callback = asCallable(_callback);
             const { bucket, key } = parseS3Url(url);
-            signedFetch('PUT', bucket, key, { body: data })
-                .then((resp) => callback({ responseCode: resp.status }))
+            s3.send(new PutObjectCommand({ Bucket: bucket, Key: key, Body: data }))
+                .then((resp) => callback({ responseCode: resp.$metadata.httpStatusCode ?? 200 }))
                 .catch(() => callback({ responseCode: 1000 }));
         },
         copyGetter() {
@@ -279,9 +143,6 @@ export function createBrowserStorageFactory(wasmMod) {
     return function factory(type, config, _mode) {
         if (!config)
             return undefined;
-        // Config can come in two shapes:
-        // 1. { credentials: { accessKeyId, secretAccessKey, sessionToken }, region, ... }
-        // 2. { aws_access_key_id, aws_secret_access_key, aws_session_token, region, ... }
         const creds = config.credentials || config;
         const storageConfig = {
             aws_access_key_id: creds.accessKeyId || creds.aws_access_key_id || config.aws_access_key_id || '',

package/dist/browser/browser/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/browser/storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/browser/storage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deeplake",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "DeepLake database SDK for Node.js and browsers",
   "exports": {
     ".": {
@@ -37,8 +37,10 @@
   "engines": {
     "node": ">=18.0.0"
   },
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.1000.0"
+  },
   "optionalDependencies": {
-    "@aws-sdk/client-s3": "^3.1000.0",
     "@aws-sdk/s3-request-presigner": "^3.1000.0",
     "pg": "^8.11.0",
     "sharp": "^0.34.5"