deeplake 0.3.16 → 0.3.21

package/dist/node/{node/storage.d.ts → storage.d.ts}

@@ -11,5 +11,10 @@
  * The C++ side passes refresh metadata (orgId, dsName, token) through the
  * config object so the JS side can call the backend API for fresh creds.
  */
+/**
+ * Register a callback that fires when all in-flight storage operations
+ * have completed.  If none are in flight, the callback fires immediately.
+ */
+export declare function onDrained(cb: () => void): void;
 export declare function createStorageFactory(wasmModule: any): (type: string, config: any, mode?: string) => any;
 //# sourceMappingURL=storage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/node/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AA6OH;;;GAGG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAM9C;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,GAAG,IAEhD,MAAM,MAAM,EACZ,QAAQ,GAAG,EACX,OAAO,MAAM,KACZ,GAAG,CAwHP"}

package/dist/node/{node/storage.js → storage.js}

@@ -13,6 +13,7 @@
  * config object so the JS side can call the backend API for fresh creds.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.onDrained = onDrained;
 exports.createStorageFactory = createStorageFactory;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
@@ -22,6 +23,10 @@ const REFRESH_BUFFER_MS = 5 * 60 * 1000;
 const DEFAULT_CRED_LIFETIME_MS = 60 * 60 * 1000;
 // Cooldown after a failed refresh attempt (matches native 60s)
 const REFRESH_FAILURE_COOLDOWN_MS = 60 * 1000;
+/**
+ * Manages an S3Client whose credentials can be rotated by calling the
+ * backend API for fresh STS tokens.
+ */
 class RotatingS3Client {
     client;
     region;
@@ -39,6 +44,7 @@ class RotatingS3Client {
         this.createdAt = Date.now();
         this.debug = debug;
     }
+    /** Get the current S3 client, refreshing credentials if needed. */
     async getClient() {
         if (!this.refreshMeta)
             return this.client;
@@ -47,12 +53,14 @@ class RotatingS3Client {
         const needsRefresh = age > DEFAULT_CRED_LIFETIME_MS - REFRESH_BUFFER_MS;
         if (!needsRefresh)
             return this.client;
+        // Cooldown after failure
         if (this.lastFailureAt && now - this.lastFailureAt < REFRESH_FAILURE_COOLDOWN_MS) {
             if (this.debug) {
                 console.log('[storage] skipping credential refresh — in cooldown after previous failure');
             }
             return this.client;
         }
+        // Serialize concurrent refresh attempts
         if (this.refreshInProgress) {
             await this.refreshInProgress;
             return this.client;
@@ -73,6 +81,11 @@ class RotatingS3Client {
         }
         try {
             const resp = await fetchCredentials(meta);
+            // Build new S3 credentials from backend response.
+            // Field mapping mirrors C++ update_params.cpp (lines 57-66):
+            //   token → session_token, region → region_name
+            // The backend API may return fields under different names depending
+            // on the provider and version.
             const creds = resp.creds;
             const s3Config = {
                 region: creds.region || creds.region_name || this.region,
@@ -81,9 +94,16 @@ class RotatingS3Client {
                     secretAccessKey: creds.aws_secret_access_key ?? creds.secret_key,
                     sessionToken: creds.aws_session_token ?? creds.token ?? creds.session_token,
                 },
+                requestHandler: new (require('@smithy/node-http-handler').NodeHttpHandler)({
+                    requestTimeout: 8_000,
+                    connectionTimeout: 8_000,
+                }),
+                maxAttempts: 30,
+                followRegionRedirects: true,
             };
             if (this.endpoint) {
                 s3Config.endpoint = this.endpoint;
+                s3Config.forcePathStyle = true;
             }
             this.client = new client_s3_1.S3Client(s3Config);
             this.createdAt = Date.now();
@@ -95,9 +115,16 @@ class RotatingS3Client {
         catch (e) {
             this.lastFailureAt = Date.now();
             console.warn(`[storage] credential refresh failed: ${e.message ?? e}`);
+            // Keep using the old client — it may still work if expiry hasn't hit yet
         }
     }
 }
+/**
+ * Fetch fresh credentials from the backend API.
+ * Mirrors the C++ update_params() flow in client/update_params.cpp.
+ *
+ * Returns the raw response so the caller can interpret fields per provider.
+ */
 async function fetchCredentials(meta) {
     let url;
     if (meta.dsName) {
@@ -125,6 +152,11 @@ async function fetchCredentials(meta) {
     const repoType = (json.repo_type ?? 's3');
     return { repoType, creds };
 }
+/**
+ * Resolve the backend API endpoint from the WASM module.
+ * The C++ backend::backend singleton stores the endpoint set via
+ * deeplake_set_endpoint().
+ */
 function resolveApiEndpoint(wasmModule) {
     try {
         const backend = wasmModule.deeplake_backend_client_instance();
@@ -137,13 +169,62 @@ function resolveApiEndpoint(wasmModule) {
     }
     return 'https://app.activeloop.ai';
 }
-const inflight_tracker_1 = require("../shared/inflight-tracker");
 // Registry to prevent V8 GC from collecting JS objects that are only
 // referenced by emscripten::val handles in C++ WASM code.
 const _liveObjects = new Set();
+// ---------------------------------------------------------------------------
+// In-flight operation tracker
+//
+// Every storage callback (download, list, exists, …) clones a WASM
+// completion object and invokes it asynchronously.  Between clone() and
+// delete() the C++ side holds pointers into the WASM function table.
+// deeplakeRelease() must wait for all in-flight callbacks to finish
+// before calling obj.delete() on the dataset handle, otherwise the
+// destructor frees the C++ objects while callbacks are still registered
+// ("null function or function signature mismatch").
+// ---------------------------------------------------------------------------
+let _inFlightCount = 0;
+let _drainCallbacks = [];
+/**
+ * Wrap completion.clone() with in-flight tracking.
+ * The returned object's .delete() method decrements the counter and
+ * fires any registered drain callbacks when the count reaches zero.
+ */
+function trackClone(completion) {
+    const c1 = completion.clone();
+    _inFlightCount++;
+    const origDelete = c1.delete.bind(c1);
+    c1.delete = () => {
+        origDelete();
+        _inFlightCount--;
+        if (_inFlightCount === 0 && _drainCallbacks.length > 0) {
+            const cbs = _drainCallbacks;
+            _drainCallbacks = [];
+            for (const cb of cbs)
+                cb();
+        }
+    };
+    return c1;
+}
+/**
+ * Register a callback that fires when all in-flight storage operations
+ * have completed.  If none are in flight, the callback fires immediately.
+ */
+function onDrained(cb) {
+    if (_inFlightCount === 0) {
+        cb();
+    }
+    else {
+        _drainCallbacks.push(cb);
+    }
+}
 function createStorageFactory(wasmModule) {
     return function clientFactory(type, config, mode) {
         if (type !== 'aws') {
+            // GCS and Azure storage types are supported in the browser visualizer
+            // (via GCSGetter/AzureGetter) but not yet in the Node.js SDK.
+            // The C++ side may request these types when datasets are backed by
+            // non-S3 storage. For now, throw a clear error.
             throw new Error(`Unsupported storage type: ${type}. The Node.js SDK currently supports "aws" only. ` +
                 `GCS and Azure require additional dependencies (@azure/storage-blob, etc.).`);
         }
@@ -153,6 +234,9 @@ function createStorageFactory(wasmModule) {
             process.env.AWS_DEFAULT_REGION ||
             'us-east-1';
         const endpoint = config?.endpoint ?? undefined;
+        // Resolve credentials: prefer config from C++, fall back to process.env.
+        // In WASM, std::getenv() doesn't read Node.js process.env, so the C++
+        // credential chain can't pick up env vars — we must do it here.
         let resolvedCreds;
         if (credentials?.accessKeyId && credentials?.secretAccessKey) {
             resolvedCreds = {
@@ -169,6 +253,7 @@ function createStorageFactory(wasmModule) {
                 sessionToken: process.env.AWS_SESSION_TOKEN,
             };
         }
+        // Build refresh metadata from C++ params (org_id, ds_name, token)
         const refresh = config?.refresh;
         let refreshMeta = null;
         if (refresh?.orgId && refresh?.token && (refresh?.dsName || refresh?.credsKey)) {
@@ -183,9 +268,24 @@ function createStorageFactory(wasmModule) {
         const s3Config = {
             region,
             credentials: resolvedCreds,
+            // Match C++ native client: 8s request/connect timeouts (s3_utils.hpp:313-314)
+            requestHandler: new (require('@smithy/node-http-handler').NodeHttpHandler)({
+                requestTimeout: 8_000,
+                connectionTimeout: 8_000,
+            }),
+            // Match C++ native client: custom retry (s3_retry_strategy.hpp)
+            // 200ms interval, ~6s max → roughly 30 attempts
+            maxAttempts: 30,
+            // Disable IMDS lookups to avoid 5-10s hangs when no instance role
+            // is available (matches C++ shouldDisableIMDS=true)
+            disableHostPrefix: false,
+            followRegionRedirects: true,
         };
         if (endpoint) {
             s3Config.endpoint = endpoint;
+            // Match C++ native client: use path-style addressing for custom
+            // endpoints (s3_utils.hpp:329 — use_virtual_addressing=false)
+            s3Config.forcePathStyle = true;
         }
         const dbg = !!process.env.DEEPLAKE_STORAGE_DEBUG;
         if (dbg) {
@@ -200,6 +300,7 @@ function createStorageFactory(wasmModule) {
             result = createGetter(rotatingClient, wasmModule);
         }
         if (dbg) {
+            // Wrap in Proxy to trace ALL method accesses and calls
             const label = mode === 'w' ? 'writer' : 'reader';
             result = new Proxy(result, {
                 get(target, prop) {
@@ -221,6 +322,8 @@ function createStorageFactory(wasmModule) {
                 },
             });
         }
+        // Keep a strong JS reference so V8's GC doesn't collect this object
+        // while C++ still holds an emscripten::val handle to it.
         _liveObjects.add(result);
         return result;
     };
@@ -245,7 +348,7 @@ function createGetter(rotatingClient, wasmModule) {
     const getter = {
         generateGetPresignedUrl(key, completion) {
             key = removeScheme(key);
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, objKey] = splitBucketKey(key);
             rotatingClient.getClient().then((client) => (0, s3_request_presigner_1.getSignedUrl)(client, new client_s3_1.GetObjectCommand({ Bucket: bucket, Key: objKey }), {
                 expiresIn: 3600,
@@ -261,7 +364,7 @@ function createGetter(rotatingClient, wasmModule) {
         },
         exists(key, completion) {
             key = removeScheme(key);
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, objKey] = splitBucketKey(key);
             if (debug) {
                 console.log(`[storage:exists] bucket=${bucket} key=${objKey}`);
@@ -279,7 +382,7 @@ function createGetter(rotatingClient, wasmModule) {
         },
         download(key, range, index, completion) {
             key = removeScheme(key);
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, objKey] = splitBucketKey(key);
             if (debug) {
                 console.log(`[storage:read] bucket=${bucket} key=${objKey} range=${range || 'none'}`);
@@ -324,7 +427,10 @@ function createGetter(rotatingClient, wasmModule) {
                     c1.call({ responseCode: 404, message: 'resource_not_found' });
                 }
                 else {
-                    c1.call({ responseCode: 1000, message: err.message ?? 'unknown_error' });
+                    const code = err.$metadata?.httpStatusCode ?? 1000;
+                    const name = err.name ?? err.Code ?? '';
+                    const msg = name ? `${name}: ${err.message ?? 'unknown_error'}` : (err.message ?? 'unknown_error');
+                    c1.call({ responseCode: code, message: msg });
                 }
                 c1.delete();
             }));
@@ -332,7 +438,7 @@ function createGetter(rotatingClient, wasmModule) {
             wasmModule.storeJsObject(index, { abort() { } });
         },
         list(root, key, startAfter, completion) {
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, prefix] = splitBucketPrefix(root);
             if (debug) {
                 console.log(`[storage:list] bucket=${bucket} prefix=${prefix} key=${key}`);
@@ -364,7 +470,10 @@ function createGetter(rotatingClient, wasmModule) {
                         impl(data.NextMarker);
                     })
                         .catch((err) => {
-                        c1.call({ responseCode: 1000, message: err.message });
+                        const code = err.$metadata?.httpStatusCode ?? 1000;
+                        const name = err.name ?? err.Code ?? '';
+                        const msg = name ? `${name}: ${err.message ?? 'unknown_error'}` : (err.message ?? 'unknown_error');
+                        c1.call({ responseCode: code, message: msg });
                         c1.delete();
                     });
                 };
@@ -372,7 +481,7 @@ function createGetter(rotatingClient, wasmModule) {
             });
         },
         listDirs(root, prefix, completion) {
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, rootPrefix] = splitBucketPrefix(root);
             const finalPrefix = (rootPrefix.endsWith('/') ? rootPrefix : `${rootPrefix}/`) + prefix;
             rotatingClient.getClient().then((client) => client
@@ -387,12 +496,15 @@ function createGetter(rotatingClient, wasmModule) {
                 c1.delete();
             })
                 .catch((err) => {
-                c1.call({ responseCode: 1000, message: err.message });
+                const code = err.$metadata?.httpStatusCode ?? 1000;
+                const name = err.name ?? err.Code ?? '';
+                const msg = name ? `${name}: ${err.message ?? 'unknown_error'}` : (err.message ?? 'unknown_error');
+                c1.call({ responseCode: code, message: msg });
                 c1.delete();
             }));
         },
         metadata(root, key, completion) {
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, prefix] = splitBucketPrefix(root);
             const finalPrefix = (prefix.endsWith('/') ? prefix : `${prefix}/`) + key;
             rotatingClient.getClient().then((client) => client
@@ -419,7 +531,10 @@ function createGetter(rotatingClient, wasmModule) {
                 c1.delete();
             })
                 .catch((err) => {
-                c1.call({ responseCode: 1000, message: err.message });
+                const code = err.$metadata?.httpStatusCode ?? 1000;
+                const name = err.name ?? err.Code ?? '';
+                const msg = name ? `${name}: ${err.message ?? 'unknown_error'}` : (err.message ?? 'unknown_error');
+                c1.call({ responseCode: code, message: msg });
                 c1.delete();
             }));
         },
@@ -434,7 +549,7 @@ function createWriter(rotatingClient, wasmModule) {
     const writer = {
         saveWithCompletion(key, content, completion) {
             key = removeScheme(key);
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, objKey] = splitBucketKey(key);
             if (debug) {
                 const size = typeof content === 'string' ? content.length : content.byteLength;
@@ -453,16 +568,19 @@ function createWriter(rotatingClient, wasmModule) {
                 c1.delete();
             })
                 .catch((err) => {
+                const code = err.$metadata?.httpStatusCode ?? 1000;
+                const name = err.name ?? err.Code ?? '';
+                const msg = name ? `${name}: ${err.message ?? 'unknown_error'}` : (err.message ?? 'unknown_error');
                 if (debug) {
-                    console.log(`[storage:write:error] key=${objKey} err=${err.message}`);
+                    console.log(`[storage:write:error] key=${objKey} err=${msg}`);
                 }
-                c1.call({ responseCode: 1000, message: err.message });
+                c1.call({ responseCode: code, message: msg });
                 c1.delete();
             }));
         },
         remove(key, completion) {
             key = removeScheme(key);
-            const c1 = (0, inflight_tracker_1.trackClone)(completion);
+            const c1 = trackClone(completion);
             const [bucket, objKey] = splitBucketKey(key);
             rotatingClient.getClient().then((client) => client
                 .send(new client_s3_1.DeleteObjectCommand({ Bucket: bucket, Key: objKey }))
@@ -473,7 +591,10 @@ function createWriter(rotatingClient, wasmModule) {
                 c1.delete();
             })
                 .catch((err) => {
-                c1.call({ responseCode: 1000, message: err.message });
+                const code = err.$metadata?.httpStatusCode ?? 1000;
+                const name = err.name ?? err.Code ?? '';
+                const msg = name ? `${name}: ${err.message ?? 'unknown_error'}` : (err.message ?? 'unknown_error');
+                c1.call({ responseCode: code, message: msg });
                 c1.delete();
             }));
         },

package/dist/node/storage.js.map

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

package/dist/node/{node/wasm.js → wasm.js}

@@ -38,7 +38,7 @@ exports.initializeWasm = initializeWasm;
 exports.deinitializeWasm = deinitializeWasm;
 const nodePath = __importStar(require("path"));
 const storage_1 = require("./storage");
-const wasm_common_1 = require("../shared/wasm-common");
+const wasm_common_1 = require("./shared/wasm-common");
 let wasmInitPromise = null;
 let wasmModule = null;
 /**

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "deeplake",
-  "version": "0.3.16",
+  "version": "0.3.21",
   "description": "DeepLake database SDK for Node.js and browsers",
   "exports": {
     ".": {
       "node": {
-        "types": "./dist/node/node/index.d.ts",
-        "require": "./dist/node/node/index.js",
-        "import": "./dist/node/node/index.js"
+        "types": "./dist/node/index.d.ts",
+        "require": "./dist/node/index.js",
+        "import": "./dist/node/index.js"
       },
       "browser": {
-        "types": "./dist/browser/browser/index.d.ts",
-        "import": "./dist/browser/browser/index.js"
+        "types": "./dist/browser/index.d.ts",
+        "import": "./dist/browser/index.js"
       },
       "default": {
-        "types": "./dist/browser/browser/index.d.ts",
-        "import": "./dist/browser/browser/index.js"
+        "types": "./dist/browser/index.d.ts",
+        "import": "./dist/browser/index.js"
       }
     }
   },
-  "main": "./dist/node/node/index.js",
-  "types": "./dist/node/node/index.d.ts",
-  "browser": "./dist/browser/browser/index.js",
+  "main": "./dist/node/index.js",
+  "types": "./dist/node/index.d.ts",
+  "browser": "./dist/browser/index.js",
   "files": [
     "dist",
     "wasm"
   ],
   "scripts": {
-    "copy-wasm:browser": "mkdir -p wasm/browser && cp ../browser/dist-wasm/deeplake_browser.js ../browser/dist-wasm/deeplake_browser.wasm ../browser/dist-wasm/deeplake_browser.worker.js wasm/browser/",
+    "copy-wasm:browser": "mkdir -p wasm/browser && (test -f wasm/browser/deeplake_browser.wasm || cp ../browser/dist-wasm/deeplake_browser.js ../browser/dist-wasm/deeplake_browser.wasm ../browser/dist-wasm/deeplake_browser.worker.js wasm/browser/)",
     "build": "tsc -p tsconfig.node.json && tsc -p tsconfig.browser.json && npm run copy-wasm:browser",
     "build:node": "tsc -p tsconfig.node.json",
     "build:browser": "tsc -p tsconfig.browser.json",
@@ -37,8 +37,12 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "optionalDependencies": {
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.1000.0",
     "@aws-sdk/s3-request-presigner": "^3.1000.0",
+    "@smithy/node-http-handler": "^4.0.0"
+  },
+  "optionalDependencies": {
     "pg": "^8.11.0",
     "sharp": "^0.34.5"
   },