@checksub_team/peaks_timeline 1.6.4 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@checksub_team/peaks_timeline",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "JavaScript UI component for displaying audio waveforms",
   "main": "./peaks.js",
   "types": "./peaks.js.d.ts",

package/peaks.js

@@ -14015,27 +14015,45 @@ module.exports = function (Data) {
         }
     };
     DataRetriever.prototype._retireveDataOnline = function (source, url) {
-        var self = this;
         var data = new Data();
         this._data[url] = data;
         this._waitingForData[url] = [source];
-        fetch(url).then(function (response) {
-            return response.blob();
-        }).then(function (blob) {
-            var type = blob.type;
-            if (type) {
-                type = type.split('/')[0];
-            } else {
-                type = 'other';
+        this._fetch(url, data, 1000, 10);
+    };
+    DataRetriever.prototype._fetch = function (url, data, delay, limit) {
+        var self = this;
+        function later(delay) {
+            return new Promise(function (resolve) {
+                setTimeout(resolve, delay);
+            });
+        }
+        function recur(timesTried, err) {
+            if (timesTried >= limit) {
+                return Promise.reject(err);
             }
-            data.type = type;
-            data.content = URL.createObjectURL(blob);
-            if (self._waitingForData[url]) {
-                self._waitingForData[url].forEach(function (src) {
-                    self._peaks.emit('data.retrieved', data, src, url);
+            return fetch(url).catch(function (err) {
+                later(delay).then(function () {
+                    recur(timesTried + 1, err);
                 });
-            }
-        });
+            }).then(function (response) {
+                return response.blob();
+            }).then(function (blob) {
+                var type = blob.type;
+                if (type) {
+                    type = type.split('/')[0];
+                } else {
+                    type = 'other';
+                }
+                data.type = type;
+                data.content = URL.createObjectURL(blob);
+                if (self._waitingForData[url]) {
+                    self._waitingForData[url].forEach(function (src) {
+                        self._peaks.emit('data.retrieved', data, src, url);
+                    });
+                }
+            });
+        }
+        return recur(0);
     };
     return DataRetriever;
 }(_dereq_('./data'));
@@ -18404,13 +18422,13 @@ module.exports = function (Utils) {
         }
         if (Utils.isNullOrUndefined(options.previewHeight)) {
             options.previewHeight = 0;
-        } else if (!Utils.isInteger(options.previewHeight)) {
-            throw new TypeError('peaks.sources.' + context + ': previewHeight must be an integer');
+        } else if (!Utils.isNumber(options.previewHeight)) {
+            throw new TypeError('peaks.sources.' + context + ': previewHeight must be a number');
         }
         if (Utils.isNullOrUndefined(options.binaryHeight)) {
             options.binaryHeight = 0;
-        } else if (!Utils.isInteger(options.binaryHeight)) {
-            throw new TypeError('peaks.sources.' + context + ': binaryHeight must be an integer');
+        } else if (!Utils.isNumber(options.binaryHeight)) {
+            throw new TypeError('peaks.sources.' + context + ': binaryHeight must be a number');
         }
         if (options.previewUrl && !options.previewHeight) {
             if (options.binaryHeight) {

package/src/data-retriever.js

@@ -54,36 +54,60 @@ define([
     };
 
     DataRetriever.prototype._retireveDataOnline = function(source, url) {
-        var self = this;
-
         var data = new Data();
 
         this._data[url] = data;
         this._waitingForData[url] = [source];
 
-        fetch(url)
-            .then(function(response) {
-                return response.blob();
-            })
-            .then(function(blob) {
-                var type = blob.type;
-
-                if (type) {
-                    type = type.split('/')[0];
-                }
-                else {
-                    type = 'other';
-                }
+        this._fetch(url, data, 1000, 10);
+    };
 
-                data.type = type;
-                data.content = URL.createObjectURL(blob);
+    DataRetriever.prototype._fetch = function(url, data, delay, limit) {
+        var self = this;
 
-                if (self._waitingForData[url]) {
-                    self._waitingForData[url].forEach(function(src) {
-                        self._peaks.emit('data.retrieved', data, src, url);
-                    });
-                }
+        function later(delay) {
+            return new Promise(function(resolve) {
+                setTimeout(resolve, delay);
             });
+        }
+
+        function recur(timesTried, err) {
+            if (timesTried >= limit) {
+                return Promise.reject(err);
+            }
+
+            return fetch(url)
+                .catch(function(err) {
+                    later(delay)
+                        .then(function() {
+                            recur(timesTried + 1, err);
+                        });
+                })
+                .then(function(response) {
+                    return response.blob();
+                })
+                .then(function(blob) {
+                    var type = blob.type;
+
+                    if (type) {
+                        type = type.split('/')[0];
+                    }
+                    else {
+                        type = 'other';
+                    }
+
+                    data.type = type;
+                    data.content = URL.createObjectURL(blob);
+
+                    if (self._waitingForData[url]) {
+                        self._waitingForData[url].forEach(function(src) {
+                            self._peaks.emit('data.retrieved', data, src, url);
+                        });
+                    }
+                });
+        }
+
+        return recur(0);
     };
 
     return DataRetriever;

package/src/source.js

@@ -216,15 +216,15 @@ define([
     if (Utils.isNullOrUndefined(options.previewHeight)) {
       options.previewHeight = 0;
     }
-    else if (!Utils.isInteger(options.previewHeight)) {
-      throw new TypeError('peaks.sources.' + context + ': previewHeight must be an integer');
+    else if (!Utils.isNumber(options.previewHeight)) {
+      throw new TypeError('peaks.sources.' + context + ': previewHeight must be a number');
     }
 
     if (Utils.isNullOrUndefined(options.binaryHeight)) {
       options.binaryHeight = 0;
     }
-    else if (!Utils.isInteger(options.binaryHeight)) {
-      throw new TypeError('peaks.sources.' + context + ': binaryHeight must be an integer');
+    else if (!Utils.isNumber(options.binaryHeight)) {
+      throw new TypeError('peaks.sources.' + context + ': binaryHeight must be a number');
     }
 
     if (options.previewUrl && !options.previewHeight) {