igv 2.15.5 → 2.15.7

package/dist/igv.js

@@ -18584,7 +18584,6 @@
             });
             this.RANGE_WARNING_GIVEN = false;
             this.oauth = new Oauth();
-            this.contentLengthMap = new Map();
         }
 
         setApiKey(key) {
@@ -18662,18 +18661,6 @@
             }
         }
 
-        async getContentLength(url, options) {
-            if (!this.contentLengthMap.has(url)) {
-                options = options || {};
-                options.method = 'HEAD';
-                options.GET_CONTENT_LENGTH = true;
-                const contentLengthString = await this._loadURL(url, options);
-                const contentLength = contentLengthString ? Number.parseInt(contentLengthString) : -1;
-                this.contentLengthMap.set(url, contentLength);
-            }
-            return this.contentLengthMap.get(url)
-        }
-
         async _loadURL(url, options) {
 
             const self = this;
@@ -18688,11 +18675,6 @@
                 oauthToken = await (typeof oauthToken === 'function' ? oauthToken() : oauthToken);
             }
 
-            let contentLength = -1;
-            if (options.range && !isAmazonV4Signed(url) && !isGoogleStorageSigned(url)) {
-                contentLength = await this.getContentLength(url);
-            }
-
             return new Promise(function (resolve, reject) {
 
                 // Various Google tansformations
@@ -18733,13 +18715,7 @@
                 }
 
                 if (range) {
-                    let rangeEnd = "";
-                    if (range.size) {
-                        rangeEnd = range.start + range.size - 1;
-                        if (contentLength > 0) {
-                            rangeEnd = Math.min(rangeEnd, contentLength - 1);
-                        }
-                    }
+                    var rangeEnd = range.size ? range.start + range.size - 1 : "";
                     xhr.setRequestHeader("Range", "bytes=" + range.start + "-" + rangeEnd);
                     //      xhr.setRequestHeader("Cache-Control", "no-cache");    <= This can cause CORS issues, disabled for now
                 }
@@ -18765,11 +18741,6 @@
                 }
 
                 xhr.onload = async function (event) {
-
-                    if (options.GET_CONTENT_LENGTH) {
-                        resolve(xhr.getResponseHeader('content-length'));
-                    }
-
                     // when the url points to a local file, the status is 0 but that is not an error
                     if (xhr.status === 0 || (xhr.status >= 200 && xhr.status <= 300)) {
                         if (range && xhr.status !== 206 && range.start !== 0) {
@@ -19092,10 +19063,6 @@
         }
     }
 
-    function isAmazonV4Signed(url) {
-        return url.indexOf("X-Amz-Signature") > -1
-    }
-
 
     const igvxhr = new IGVXhr();
 
@@ -23977,7 +23944,7 @@
         }
     };
 
-    const _version = "2.15.5";
+    const _version = "2.15.7";
     function version() {
         return _version
     }
@@ -32202,30 +32169,45 @@
          * @param fulfill - function to receive result
          * @param asUint8 - optional flag to return result as an UInt8Array
          */
-        async dataViewForRange(requestedRange, asUint8) {
-
-            const hasData = (this.data && (this.range.start <= requestedRange.start) &&
-                ((this.range.start + this.range.size) >= (requestedRange.start + requestedRange.size)));
+        async dataViewForRange(requestedRange, asUint8, retries = 0) {
+            try {
+                console.log(`buffered reader ${requestedRange}`);
+                const hasData = (this.data && (this.range.start <= requestedRange.start) &&
+                    ((this.range.start + this.range.size) >= (requestedRange.start + requestedRange.size)));
+
+                if (!hasData) {
+                    let bufferSize;
+                    // If requested range size is specified, potentially expand buffer size
+                    if (requestedRange.size) {
+                        bufferSize = Math.max(this.bufferSize, requestedRange.size);
+                    } else {
+                        bufferSize = this.bufferSize;
+                    }
+                    if (this.contentLength) {
+                        bufferSize = Math.min(bufferSize, this.contentLength - requestedRange.start);
+                    }
+                    const loadRange = {start: requestedRange.start, size: bufferSize};
+                    const arrayBuffer = await igvxhr.loadArrayBuffer(this.path, buildOptions(this.config, {range: loadRange}));
+                    this.data = arrayBuffer;
+                    this.range = loadRange;
+                }
 
-            if (!hasData) {
-                let bufferSize;
-                // If requested range size is specified, potentially expand buffer size
-                if (requestedRange.size) {
-                    bufferSize = Math.max(this.bufferSize, requestedRange.size);
-                } else {
-                    bufferSize = this.bufferSize;
+                const len = this.data.byteLength;
+                const bufferStart = requestedRange.start - this.range.start;
+                return asUint8 ?
+                    new Uint8Array(this.data, bufferStart, len - bufferStart) :
+                    new DataView(this.data, bufferStart, len - bufferStart)
+            } catch (e) {
+                if (retries === 0 && e.message && e.message.startsWith("416")) {
+                    try {
+                        this.contentLength = await igvxhr.getContentLength(this.path, buildOptions(this.config));
+                        return this.dataViewForRange(requestedRange, asUint8, ++retries)
+                    } catch (e1) {
+                        console.error(e1);
+                    }
+                    throw e
                 }
-                const loadRange = {start: requestedRange.start, size: bufferSize};
-                const arrayBuffer = await igvxhr.loadArrayBuffer(this.path, buildOptions(this.config, {range: loadRange}));
-                this.data = arrayBuffer;
-                this.range = loadRange;
             }
-
-            const len = this.data.byteLength;
-            const bufferStart = requestedRange.start - this.range.start;
-            return asUint8 ?
-                new Uint8Array(this.data, bufferStart, len - bufferStart) :
-                new DataView(this.data, bufferStart, len - bufferStart)
         }
     }