Merge branch 'hotfix-5.1.1'

Author: csvurt

package.json

@@ -2,7 +2,7 @@
   "name": "xml3d.js",
   "description": "XML3D implementation based on JS and WebGL",
   "homepage": "http://ww.xml3d.org",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/xml3d/xml3d.js"

src/data/adapter/javascript/factory.js

@@ -5,7 +5,8 @@ var JavaScriptFormatHandler = function () {
 XML3D.createClass(JavaScriptFormatHandler, XML3D.resource.FormatHandler);
 
 JavaScriptFormatHandler.prototype.isFormatSupported = function (response) {
-    return response.headers.get("Content-Type") === "application/javascript";
+    var contentType = response.headers.get("Content-Type");
+    return !!contentType && contentType.match(/\/javascript/);
 };
 
 

src/data/adapter/json/factory.js

@@ -11,7 +11,8 @@ XML3D.createClass(XML3DJSONFormatHandler, XML3D.resource.FormatHandler);
 
 XML3DJSONFormatHandler.prototype.isFormatSupported = function(response) {
     if (response.headers.has("Content-Type")) {
-        return response.headers.get("Content-Type") === "application/json";
+        var contentType = response.headers.get("Content-Type");
+        return contentType.match(/\/json/);
     }
     if (response.url.match(/\.json/)) {
         return true;

src/resource/fetcher.js

@@ -1,9 +1,6 @@
 
 require("whatwg-fetch");
 var URI = require("../utils/uri.js").URI;
-var Options = require("../utils/options.js");
-
-var MAX_CONCURRENT_REQUESTS = 100;  // Maximum number of requests awaiting a response
 
 var c_requestHooks = [];    // Request hooks called for each outgoing request
 var c_formatHandlers = [];  // All registered FormatHandler plugins
@@ -22,21 +19,26 @@ Resource.fetch = function(uriString, opt) {
     opt = initOptions(opt);
     var uri = new URI(uriString);
 
+    for (var i=0; i < c_requestHooks.length; i++) {
+        c_requestHooks[i](uri, opt);
+    }
+    if (opt.abort) {
+        return Promise.reject(new RequestAbortedException(uri));
+    }
+
+    return doFetch(uri, opt);
+};
+
+function doFetch(uri, opt) {
     return new Promise(function(resolve, reject) {
-        for (var i=0; i < c_requestHooks.length; i++) {
-            c_requestHooks[i](uri, opt);
-        }
-        if (opt.abort) {
-            throw new RequestAbortedException(uri);
-        }
         scheduleRequest({
             opt : opt,
             uri : uri,
             resolve : resolve,
             reject : reject
         });
     });
-};
+}
 
 var popRequestQueue = function() {
     var request = c_requestQueue.shift();
@@ -54,21 +56,38 @@ var popRequestQueue = function() {
 };
 
 Resource.getDocument = function(urlString, opt) {
-    return Resource.fetch(urlString, opt)
+    opt = initOptions(opt);
+    var uri = new URI(urlString);
+
+    for (var i=0; i < c_requestHooks.length; i++) {
+        c_requestHooks[i](uri, opt);
+    }
+    if (opt.abort) {
+        Promise.reject(new RequestAbortedException(uri));
+    }
+
+    var cache;
+    if (opt.allowCaching) {
+        if (cache = c_cachedDocuments.get(urlString)) {
+            // We can skip the fetch phase and piggy back on the result of the previous fetch, this avoids unnecessary Requests
+            return cache.pending ? cache.pending : Promise.resolve(cache.document);
+        }
+
+        // There is no pending or complete Request for this url so lets create a cache entry and start one
+        cache = {fragments: []};
+        c_cachedDocuments.set(urlString, cache); // Resource.parseResponse expects this entry to exist already
+    }
+
+    var documentPromise = doFetch(urlString, opt)
         .then(function(response) {
             if (!response.ok) {
                 throw new RequestFailedException(response);
             }
             response.originalURL = urlString;
-            var cache;
-            if (cache = c_cachedDocuments.get(urlString)) {
-                return cache.pending ? cache.pending : cache.document;
-            } else {
-                cache = { fragments : [] };
-                c_cachedDocuments.set(urlString, cache); // Resource.parseResponse expects this entry to exist already
-                cache.pending = Resource.parseResponse(response);
-                return cache.pending;
-            }
+            var cache = { fragments : [] };
+            c_cachedDocuments.set(urlString, cache); // Resource.parseResponse expects this entry to exist already
+            cache.pending = Resource.parseResponse(response);
+            return cache.pending;
         }).then(function(doc) {
             doc._documentURL = urlString;
             var cache = c_cachedDocuments.get(urlString);
@@ -79,6 +98,12 @@ Resource.getDocument = function(urlString, opt) {
             c_cachedDocuments.has(urlString) && delete c_cachedDocuments.get(urlString).pending;
             throw exception;
         });
+
+    if (cache) {
+        cache.pending = documentPromise;
+    }
+
+    return documentPromise;
 };
 
 Resource.parseResponse = function(response) {
@@ -144,7 +169,7 @@ var prioritySort = function(a, b) {
 
 var tickWorkWindow = function() {
     // Both of these loops trigger asynchronous work through Promises so working through all queue items shouldn't block the thread for too long
-    while (c_requestQueue.length > 0 && c_openRequests < MAX_CONCURRENT_REQUESTS) {
+    while (c_requestQueue.length > 0) {
         popRequestQueue();
     }
 
@@ -159,6 +184,7 @@ var initOptions = function(opt) {
     opt.headers = opt.headers || {};
     opt.priority = opt.priority || 0;
     opt.abort = opt.abort || false;
+    opt.allowCaching = opt.allowCaching !== undefined ? opt.allowCaching : true;
     return opt;
 };
 

src/resource/xml3dformathandler.js

@@ -16,7 +16,8 @@ XML3D.createClass(XML3DFormatHandler, XML3D.resource.FormatHandler);
 
 XML3DFormatHandler.prototype.isFormatSupported = function (response) {
     if (response.headers.has("Content-Type")) {
-        return response.headers.get("Content-Type") === "application/xml";
+        var contentType = response.headers.get("Content-Type");
+        return contentType.match(/\/xml/);
     }
     if (response.url.match(/\.xml/)) {
         return true;
@@ -72,4 +73,4 @@ XML3D.xml3dFormatHandler = xml3dFormatHandler;
 
 module.exports = {
     XML3DFormatHandler : XML3DFormatHandler
-};
+};