x_ite 4.2.17 → 4.7.7

package/src/x_ite/InputOutput/FileLoader.js

@@ -51,11 +51,10 @@ define ([
 	"jquery",
 	"x_ite/Base/X3DObject",
 	"x_ite/Fields",
-	"x_ite/Browser/Networking/urls",
 	"x_ite/Parser/Parser",
 	"x_ite/Parser/XMLParser",
 	"x_ite/Parser/JSONParser",
-	"standard/Networking/URI",
+	"x_ite/Execution/World",
 	"standard/Networking/BinaryTransport",
 	"pako_inflate",
 	"x_ite/DEBUG",
@@ -63,11 +62,10 @@ define ([
 function ($,
           X3DObject,
           Fields,
-          urls,
           Parser,
           XMLParser,
           JSONParser,
-          URI,
+          World,
           BinaryTransport,
           pako,
           DEBUG)
@@ -76,20 +74,19 @@ function ($,
 
 	BinaryTransport ($);
 
-	var
-		TIMEOUT       = 17,
+	const
 		ECMAScript    = /^\s*(?:vrmlscript|javascript|ecmascript)\:([^]*)$/,
-		dataURL       = /^data\:([^]*?)(?:;([^]*?))?(;base64)?,([^]*)$/,
+		dataURL       = /^data:(.*?)(?:;charset=(.*?))?(?:;(base64))?,([^]*)$/,
 		contentTypeRx = /^(?:(.*?);(.*?)$)/;
 
-	var foreignExtensions = new RegExp ("\.(?:html|xhtml)$");
+	const foreignExtensions = new RegExp ("\.(?:html|xhtml)$");
 
-	var foreign = {
+	const foreign = {
 		"text/html":             true,
 		"application/xhtml+xml": true,
 	};
 
-	var defaultParameter = new Fields .MFString ();
+	const defaultParameter = new Fields .MFString ();
 
 	function FileLoader (node, external)
 	{
@@ -100,9 +97,11 @@ function ($,
 		this .external         = external === undefined ? this .browser .isExternal () : external;
 		this .executionContext = this .external ? node .getExecutionContext () : this .browser .currentScene;
 		this .userAgent        = this .browser .getName () + "/" + this .browser .getVersion () + " (X3D Browser; +" + this .browser .getProviderUrl () + ")";
+		this .target           = "";
 		this .url              = [ ];
-		this .URL              = new URI ();
+		this .URL              = new URL (this .getReferer (), this .getReferer ());
 		this .fileReader       = new FileReader ();
+		this .text             = true;
 	}
 
 	FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
@@ -120,48 +119,47 @@ function ($,
 		},
 		createX3DFromString: function (worldURL, string, success, error)
 		{
-			var scene = this .browser .createScene ();
+			const scene = this .browser .createScene ();
 
-			scene .setURL (this .browser .getLocation () .transform (worldURL));
+			if (this .node instanceof World)
+				scene .loader = this;
+			else
+				scene .setExecutionContext (this .executionContext);
+
+			scene .setWorldURL (new URL (worldURL, this .getReferer ()) .href);
 
 			if (success)
 			{
 				// Async branch.
 
-				var handlers = [
+				const handlers = [
 					function (scene, string, success, error)
 					{
-						// Try parse X3D XML Encoding.	
-						setTimeout (this .importDocument .bind (this, scene, $.parseXML (string), success, error), TIMEOUT);
+						// Try parse X3D XML Encoding.
+						this .importDocument (scene, $.parseXML (string), success, error);
 					},
 					function (scene, string, success, error)
 					{
-						// Try parse X3D JSON Encoding.	
-						setTimeout (this .importJS .bind (this, scene, JSON .parse (string), success, error), TIMEOUT);
+						// Try parse X3D JSON Encoding.
+						this .importJS (scene, JSON .parse (string), success, error);
 					},
 					function (scene, string, success, error)
 					{
 						if (success)
-						{
-							success = function (scene, success, error)
-							{
-								this .setScene (scene, success, error);
-							}
-							.bind (this, scene, success, error);
-						}
-	
-						// Try parse X3D Classic Encoding.	
+							success = this .setScene .bind (this, scene, success, error);
+
+						// Try parse X3D Classic Encoding.
 						new Parser (scene) .parseIntoScene (string, success, error);
 					},
 				];
 
-				var errors = [ ];
+				const errors = [ ];
 
-				for (var i = 0, length = handlers .length; i < length; ++ i)
+				for (const handler of handlers)
 				{
 					try
 					{
-						handlers [i] .call (this, scene, string, success, error);
+						handler .call (this, scene, string, success, error);
 						return;
 					}
 					catch (error)
@@ -179,38 +177,43 @@ function ($,
 			{
 				// Sync branch.
 
-				var handlers = [
+				const handlers = [
 					function (scene, string)
 					{
-						// Try parse X3D XML Encoding.	
+						// Try parse X3D XML Encoding.
 						this .importDocument (scene, $.parseXML (string));
 					},
 					function (scene, string)
 					{
-						// Try parse X3D JSON Encoding.	
+						// Try parse X3D JSON Encoding.
 						this .importJS (scene, JSON.parse (string));
 					},
 					function (scene, string)
 					{
-						// Try parse X3D Classic Encoding.	
+						// Try parse X3D Classic Encoding.
 						new Parser (scene) .parseIntoScene (string);
 					},
 				];
 
-				for (var i = 0, length = handlers .length; i < length; ++ i)
+				const errors = [ ];
+
+				for (const handler of handlers)
 				{
 					try
 					{
-						handlers [i] .call (this, scene, string);
+						handler .call (this, scene, string);
+
 						return scene;
 					}
 					catch (error)
 					{
 						// Try next handler.
-						console .log (error);
+						errors .push (error);
 					}
 				}
 
+				console .error (errors);
+
 				throw new Error ("Couldn't parse x3d syntax.");
 			}
 		},
@@ -219,16 +222,10 @@ function ($,
 			try
 			{
 				if (success)
-				{
-					success = function (scene, success, error)
-					{
-						this .setScene (scene, success, error);
-					}
-					.bind (this, scene, success, error);
-				}
-	
+					success = this .setScene .bind (this, scene, success, error);
+
 				new XMLParser (scene) .parseIntoScene (dom, success, error);
-		
+
 				//AP: add reference to dom for later access.
 				this .node .dom = dom;
 			}
@@ -245,16 +242,10 @@ function ($,
 			try
 			{
 				if (success)
-				{
-					success = function (scene, success, error)
-					{
-						this .setScene (scene, success, error);
-					}
-					.bind (this, scene, success, error);
-				}
+					success = this .setScene .bind (this, scene, success, error);
 
 				//AP: add reference to dom for later access.
-				this .node .dom = new JSONParser (scene) .parseJavaScript (jsobj, success, error);
+				this .node .dom = new JSONParser (scene) .parseIntoScene (jsobj, success, error);
 			}
 			catch (exception)
 			{
@@ -276,6 +267,8 @@ function ($,
 
 			scene .initLoadCount_ .removeInterest ("set_initLoadCount__", this);
 
+			delete scene .loader;
+
 			try
 			{
 				success (scene);
@@ -290,17 +283,18 @@ function ($,
 
 			if (DEBUG)
 			{
-				if (this .URL .length && this .URL .scheme !== "data")
-					console .info ("Done loading scene " + this .URL);
+				if (this .URL .protocol !== "data:")
+					console .info ("Done loading scene " + this .URL .href);
 			}
 		},
 		createX3DFromURL: function (url, parameter, callback, bindViewpoint, foreign)
 		{
 			this .bindViewpoint = bindViewpoint;
 			this .foreign       = foreign;
+			this .target        = this .getTarget (parameter || defaultParameter);
 
 			if (callback)
-				return this .loadDocument (url, parameter, this .createX3DFromURLAsync .bind (this, callback));
+				return this .loadDocument (url, this .createX3DFromURLAsync .bind (this, callback));
 
 			return this .createX3DFromURLSync (url);
 		},
@@ -311,24 +305,24 @@ function ($,
 			else
 				this .createX3DFromString (this .URL, data, callback, this .loadDocumentError .bind (this));
 		},
-		createX3DFromURLSync: function (url)
+		createX3DFromURLSync: function (urls)
 		{
-			if (url .length === 0)
+			if (urls .length === 0)
 				throw new Error ("No URL given.");
 
-			var
+			let
 				scene   = null,
 				success = false;
 
-			for (var i = 0; i < url .length; ++ i)
+			for (const url of urls)
 			{
-				this .URL = this .transform (url [i]);
+				this .URL = new URL (url, this .getReferer ());
 
 				$.ajax ({
-					url: this .URL .escape (),
+					url: this .URL .href,
 					dataType: "text",
 					async: false,
-					cache: this .browser .getBrowserOptions () .getCache (),
+					cache: this .browser .getBrowserOptions () .getCache () && this .node .getCache (),
 					//timeout: 15000,
 					global: false,
 					context: this,
@@ -346,26 +340,23 @@ function ($,
 					},
 					error: function (jqXHR, textStatus, errorThrown)
 					{
-						//console .warn ("Couldn't load URL '" + this .URL .toString () + "': " + errorThrown + ".");
+						//console .warn ("Couldn't load URL '" + this .URL .href + "': " + errorThrown + ".");
 					},
 				});
 
 				if (success)
-					break;
+					return scene;
 			}
 
-			if (success)
-				return scene;
-
-			throw new Error ("Couldn't load any url of '" + url .getValue () .join (", ") + "'.");
+			throw new Error ("Couldn't load any url of '" + Array .prototype .join .call (urls, ", ") + "'.");
 		},
 		loadScript: function (url, callback)
 		{
 			this .script = true;
 
-			this .loadDocument (url, null, callback);
+			this .loadDocument (url, callback);
 		},
-		loadDocument: function (url, parameter, callback)
+		loadDocument: function (url, callback)
 		{
 			this .url       = url .copy ();
 			this .callback  = callback;
@@ -373,15 +364,24 @@ function ($,
 			if (url .length === 0)
 				return this .loadDocumentError (new Error ("No URL given."));
 
-			this .target = this .getTarget (parameter || defaultParameter);
+			this .loadDocumentAsync (this .url .shift ());
+		},
+		loadBinaryDocument: function (url, callback)
+		{
+			this .url       = url .copy ();
+			this .callback  = callback;
+			this .text      = false;
+
+			if (url .length === 0)
+				return this .loadDocumentError (new Error ("No URL given."));
 
 			this .loadDocumentAsync (this .url .shift ());
 		},
-		getTarget: function (parameter)
+		getTarget: function (parameters)
 		{
-			for (var i = 0, length = parameter .length; i < length; ++ i)
+			for (const parameter of parameters)
 			{
-				var pair = parameter [i] .split ("=");
+				const pair = parameter .split ("=");
 
 				if (pair .length !== 2)
 					continue;
@@ -392,130 +392,120 @@ function ($,
 
 			return "";
 		},
-		loadDocumentAsync: function (URL)
+		loadDocumentAsync: function (url)
 		{
-			var uri = new URI (URL);
-
-			if (URL .length == 0)
-			{
-				this .loadDocumentError (new Error ("URL is empty."));
-				return;
-			}
-
 			try
 			{
-				if (this .bindViewpoint)
+				if (url .length === 0)
 				{
-					if (uri .filename .toString () .length === 0 && uri .query .length === 0)
-					{
-						this .bindViewpoint (uri .fragment);
-						return;
-					}
+					this .loadDocumentError (new Error ("URL is empty."));
+					return;
 				}
-			}
-			catch (exception)
-			{
-				this .loadDocumentError (exception);
-				return;
-			}
 
-			if (this .script)
-			{
-				try
+				// Script
+
+				if (this .script)
 				{
-					var result = ECMAScript .exec (URL);
-	
+					const result = ECMAScript .exec (url);
+
 					if (result)
 					{
 						this .callback (result [1]);
 						return;
 					}
 				}
-				catch (exception)
-				{
-					this .loadDocumentError (exception);
-					return;
-				}
-			}
 
-			// Test for data URL here.
+				// Test for data URL here.
 
-			this .URL = this .transform (URL);
+				{
+					const result = dataURL .exec (url);
 
-			try
-			{
-				var result = dataURL .exec (URL);
+					if (result)
+					{
+						//const mimeType = result [1];
 
-				if (result)
-				{
-					//var mimeType = result [1];
+						// ??? If called from loadURL and mime type is text/html do a window.open or window.location=URL and return; ???
 
-					// ??? If called from loadURL and mime type is text/html do a window.open or window.location=URL and return; ???
+						let data = result [4];
 
-					var data = result [4];
+						if (result [3] === "base64")
+							data = atob (data);
+						else
+							data = unescape (data);
 
-					if (result [3] === ";base64")
-						data = atob (data);
-					else
-						data = unescape (data);
+						this .callback (data);
+						return;
+					}
+				}
 
-					if (this .target .length && this .target !== "_self" && this .foreign)
-						return this .foreign (this .URL .toString () .replace (urls .fallbackExpression, ""), this .target);
+				this .URL = new URL (url, this .getReferer ());
 
-					this .callback (data);
-					return;
+				if (this .bindViewpoint)
+				{
+					if (this .URL .href .substr (0, this .getReferer () .length) === this .getReferer ())
+					{
+						this .bindViewpoint (this .URL .hash .substr (1));
+						return;
+					}
 				}
-			}
-			catch (exception)
-			{
-				this .loadDocumentError (exception);
-				return;
-			}
 
-			// Handle target
+				if (this .foreign)
+				{
+					// Handle target
 
-			if (this .target .length && this .target !== "_self" && this .foreign)
-				return this .foreign (this .URL .toString () .replace (urls .fallbackExpression, ""), this .target);
+					if (this .target .length && this .target !== "_self")
+						return this .foreign (this .URL .href, this .target);
 
-			// Handle well known foreign content depending on extension or if path looks like directory.
+					// Handle well known foreign content depending on extension or if path looks like directory.
 
-			if (this .foreign)
-			{
-				if (this .URL .extension .match (foreignExtensions))
-				{
-					return this .foreign (this .URL .toString () .replace (urls .fallbackExpression, ""), this .target);
+					if (this .URL .href .match (foreignExtensions))
+						return this .foreign (this .URL .href, this .target);
 				}
-			}
 
-			// Load URL async
-
-			$.ajax ({
-				url: this .URL .escape (),
-				dataType: "binary",
-				async: true,
-				cache: this .browser .getBrowserOptions () .getCache (),
-				//timeout: 15000,
-				global: false,
-				context: this,
-				success: function (blob, status, xhr)
-				{
-					if (this .foreign)
+				// Load URL async
+
+				$.ajax ({
+					url: this .URL .href,
+					dataType: "binary",
+					async: true,
+					cache: this .browser .getBrowserOptions () .getCache () && this .node .getCache (),
+					//timeout: 15000,
+					global: false,
+					context: this,
+					success: function (blob, status, xhr)
 					{
-						//console .log (this .getContentType (xhr));
+						if (this .foreign)
+						{
+							//console .log (this .getContentType (xhr));
 
-						if (foreign [this .getContentType (xhr)])
-							return this .foreign (this .URL .toString () .replace (urls .fallbackExpression, ""), this .target);
-					}
+							if (foreign [this .getContentType (xhr)])
+								return this .foreign (this .URL .href, this .target);
+						}
 
-					this .fileReader .onload = this .readAsArrayBuffer .bind (this, blob);
+						if (this .text)
+						{
+							this .fileReader .onload = this .readAsArrayBuffer .bind (this, blob);
 
-					this .fileReader .readAsArrayBuffer (blob);
-				},
-				error: function (xhr, textStatus, exception)
-				{
-					this .loadDocumentError (new Error (exception));
-				},
-			});
+							this .fileReader .readAsArrayBuffer (blob);
+						}
+						else
+						{
+							this .fileReader .onload = this .readAsBinaryString .bind (this);
+
+							this .fileReader .readAsBinaryString (blob);
+						}
+					},
+					error: function (xhr, textStatus, exception)
+					{
+						this .loadDocumentError (new Error (exception));
+					},
+				});
+			}
+			catch (exception)
+			{
+				this .loadDocumentError (exception);
+				return;
+			}
 		},
 		readAsArrayBuffer: function (blob)
 		{
@@ -541,6 +531,17 @@ function ($,
 				this .loadDocumentError (exception);
 			}
 		},
+		readAsBinaryString: function ()
+		{
+			try
+			{
+				this .callback (this .fileReader .result);
+			}
+			catch (exception)
+			{
+				this .loadDocumentError (exception);
+			}
+		},
 		loadDocumentError: function (exception)
 		{
 			// Output exception.
@@ -557,31 +558,14 @@ function ($,
 		},
 		error: function (exception)
 		{
-			if (this .URL .scheme === "data")
-				return;
-
-			console .warn ("Couldn't load URL '" + this .URL + "':", exception .message);
+			if (this .URL .protocol === "data:")
+				console .warn ("Couldn't load URL 'data':", exception .message);
+			else
+				console .warn ("Couldn't load URL '" + this .URL .href + "':", exception .message);
 
 			if (DEBUG)
 				console .log (exception);
 		},
-		transform: function (sURL)
-		{
-			var URL = this .getReferer () .transform (new URI (sURL));
-
-			if (URL .isLocal () || URL .host === "localhost")
-				URL = this .browser .getLocation () .getRelativePath (URL);
-			else
-			{
-				if (DEBUG)
-				{
-					if (! sURL .match (urls .fallbackExpression))
-						this .url .unshift (urls .fallbackUrl + URL);
-				}
-			}
-
-			return URL;
-		},
 		getReferer: function ()
 		{
 			if (this .node .getTypeName () === "World")
@@ -590,11 +574,11 @@ function ($,
 					return this .browser .getLocation ();
 			}
 
-			return this .executionContext .getURL ();
+			return this .executionContext .getWorldURL ();
 		},
 		getContentType: function (xhr)
 		{
-			var
+			const
 				contentType = xhr .getResponseHeader ("Content-Type"),
 				result      = contentTypeRx .exec (contentType);