jsgui3-server 0.0.121 → 0.0.122

package/resources/website-template-html-resource.js

@@ -1,231 +1,231 @@
-var path = require('path'), fs = require('fs'),
-	url = require('url'), jsgui = require('jsgui3-html'), os = require('os'), http = require('http'), libUrl = require('url'),
-	Resource = jsgui.Resource,
-	Cookies = require('cookies'), fs2 = require('../fs2');
-
-var stringify = jsgui.stringify, each = jsgui.each, arrayify = jsgui.arrayify, tof = jsgui.tof;
-var filter_map_by_regex = jsgui.filter_map_by_regex;
-var Class = jsgui.Class, Data_Object = jsgui.Data_Object, Enhanced_Data_Object = jsgui.Enhanced_Data_Object;
-var fp = jsgui.fp, is_defined = jsgui.is_defined;
-var Collection = jsgui.Collection;
-
-// Extends AutoStart_Resource?
-// May need to change around a fair few references to make it workable.
-// May need some more complicated logic to change it to the path for service.
-
-// Maybe this will be / need a Compiler.
-
-// website-html-resource....
-//  may be useful to have / use a Resource for the HTML servinh=g / compilation.
-
-// Consider the server as an HTML compiler? Or a more complex compiler?
-
-// Seems more like loading server-side compilers is the way.
-//  Load them into jsgui.
-
-// lang.load_compiler
-
-
-
-
-
-
-
-var serve_fn_html_template_from_disk = function(filePath, fn_template, obj_data, response) {
-
-    // serve templated file as html...
-
-	fs2.load_file_as_string(filePath, function (err, data) {
-
-
-		if (err) {
-			throw err;
-		} else {
-            const templated = fn_template(data, obj_data);
-
-
-
-
-			//var servableJs = updateReferencesForServing(data);
-			response.writeHead(200, {'Content-Type': 'text/html'});
-			response.end(templated);
-		}
-	});
-}
-
-
-// File_Server_Resource?
-//  So the resource has code to route to the file and then serve it.
-
-// Also a Templated_HTML resource?
-//  Connects to HTML_Template
-//  Connects to Data_Resource
-//  Populates the HTML_Template data from the Data_Resource
-
-// HTML_Template being a Data_Transformation / Data_Transformation_Resource / Transformation_Resource
-//  Codecs could be another type of Transformation_Resource
-
-// Transformation Resource could / should appear in jsgui3-client. Makes sense on the client too.
-
-// Separate loading of transformation resource, data resource, and template (resource)
-//  The transformation resource can itself load / be provided with the data resource and template resource.
-
-// jsx processing may be the best way (by far)?
-
-// or jsui templates?
-//  jsx may seem / be easiest at this stage for long term expansion and integration.
-
-
-
-class Site_Template_HTML extends Resource {
-
-	constructor(spec) {
-		super(spec);
-
-		this.meta.set('custom_paths', new Data_Object({}));
-		// Those are custom file paths.
-
-		// could have a collection of directories, indexed by name, that get served.
-
-		// Index the collection by string value?
-		this.meta.set('served_directories', new Collection({'index_by': 'name'}));
-	}
-	'start'(callback) {
-		callback(null, true);
-	}
-	'set_custom_path'(url, file_path) {
-		// But change the URL to have a smiley face instead of fullstops
-		//console.log('url', url);
-		var escaped_url = url.replace(/\./g, '☺');
-		//console.log('escaped_url', escaped_url);
-
-		//this.meta.set('custom_paths.' + escaped_url, file_path);
-		var custom_paths = this.meta.get('custom_paths');
-		//console.log('custom_paths', custom_paths);
-		custom_paths.set(escaped_url, file_path);
-
-	}
-	'serve_directory'(path) {
-		// Serves that directory, as any files given in that directory can be served from /js
-		var served_directories = this.meta.get('served_directories');
-		//console.log('served_directories ' + stringify(served_directories));
-		//served_directories.push(path);
-		served_directories.push({
-			'name': path
-		});
-		//console.log('served_directories ' + stringify(served_directories));
-		//console.log('path ' + path);
-
-		//throw 'stop';
-
-	}
-	'process'(req, res) {
-		//console.log('Site_Static_HTML processing');
-		var remoteAddress = req.connection.remoteAddress;
-		var custom_paths = this.custom_paths;
-		var rurl = req.url;
-		var pool = this.pool;
-		// should have a bunch of resources from the pool.
-		//var pool_resources = pool.resources();
-		//console.log('pool_resources ' + stringify(pool_resources));
-
-		var url_parts = url.parse(req.url, true);
-		//console.log('url_parts ' + stringify(url_parts));
-		var splitPath = url_parts.path.substr(1).split('/');
-		//console.log('resource site css splitPath ' + stringify(splitPath));
-
-		if (rurl.substr(0, 1) == '/') rurl = rurl.substr(1);
-		rurl = rurl.replace(/\./g, '☺');
-		//console.log('rurl ' + rurl);
-
-		if (rurl == '') rurl = '/';
-		var custom_response_entry = custom_paths.get(rurl);
-		//console.log('Static HTML Resource process url', req.url);
-
-
-		//console.log('custom_response_entry ' + stringify(custom_response_entry));
-
-		if (custom_response_entry) {
-			var tcr = tof(custom_response_entry);
-			//console.log('tcr ' + tcr);
-			if (tcr == 'data_value') {
-				var val = custom_response_entry.value();
-				//console.log('val ' + val);
-				var tval = tof(val);
-				if (tval === 'string') {
-					// then it should be a local file path, serve it.
-                    // need to specify a template resource / algorithm.
-
-					serve_html_file_from_disk(val, res);
-				}
-			}
-			//throw 'stop';
-		} else {
-			//console.log('splitPath', splitPath);
-			//console.log('splitPath.length', splitPath.length);
-
-			if (splitPath.length > 0) {
-
-				// Can check for /js folder.
-				//  There will be some fixed resources for the site.
-				//   They will be served by Resource objects.
-				//  There may be some overlap of resources, with there being some very fixed purpose
-				//   specific resources that could duplicate some features of the more general ones.
-				//   Eventually, some of the code from the more specific resources will be
-				//   replacable with code from the more general ones.
-
-				// Site_JavaScript resource
-				//  Will serve JavaScript files needed for the site.
-				//   Could become more advanced at some points, serving particular builds.
-
-				if (splitPath.length == 1) {
-					if (splitPath[0] == '') {
-						// Serve the default page.
-						// serve index.html
-						//serve_html_file_from_disk('./index.html', res);
-						serve_html_file_from_disk('index.html', res);
-
-
-
-
-					}
-				} else {
-					if (splitPath[0] == 'html') {
-						//var sjs = pool.get_resource('Site JavaScript');
-						//console.log('sjs ' + sjs);
-
-						//throw 'stop';
-
-						// determine the name of the file to serve, serve that file
-						//  Could use some more general kind of file server.
-
-						if (splitPath.length > 1) {
-							if (splitPath.length == 2) {
-								var fileName = splitPath[1];
-								//console.log('url_parts.path ' + url_parts.path);
-								var filePath = url_parts.path.substr(1);
-								//console.log('module.uri ' + module.uri);
-
-								// No, need the current module's relative path....
-
-								//var val2 =  path.dirname(module.uri);
-								//console.log('val2 ' + val2);
-								//throw '9) stop';
-
-								//var diskPath = val2 + '/../css/' + fileName;
-								var diskPath = '../../ws/css/' + fileName;
-
-								serve_html_file_from_disk(diskPath, res);
-							} else {
-								if (splitPath.length == 3) {
-
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
-module.exports = Site_Template_HTML;
+var path = require('path'), fs = require('fs'),
+	url = require('url'), jsgui = require('jsgui3-html'), os = require('os'), http = require('http'), libUrl = require('url'),
+	Resource = jsgui.Resource,
+	Cookies = require('cookies'), fs2 = require('../fs2');
+
+var stringify = jsgui.stringify, each = jsgui.each, arrayify = jsgui.arrayify, tof = jsgui.tof;
+var filter_map_by_regex = jsgui.filter_map_by_regex;
+var Class = jsgui.Class, Data_Object = jsgui.Data_Object, Enhanced_Data_Object = jsgui.Enhanced_Data_Object;
+var fp = jsgui.fp, is_defined = jsgui.is_defined;
+var Collection = jsgui.Collection;
+
+// Extends AutoStart_Resource?
+// May need to change around a fair few references to make it workable.
+// May need some more complicated logic to change it to the path for service.
+
+// Maybe this will be / need a Compiler.
+
+// website-html-resource....
+//  may be useful to have / use a Resource for the HTML servinh=g / compilation.
+
+// Consider the server as an HTML compiler? Or a more complex compiler?
+
+// Seems more like loading server-side compilers is the way.
+//  Load them into jsgui.
+
+// lang.load_compiler
+
+
+
+
+
+
+
+var serve_fn_html_template_from_disk = function(filePath, fn_template, obj_data, response) {
+
+    // serve templated file as html...
+
+	fs2.load_file_as_string(filePath, function (err, data) {
+
+
+		if (err) {
+			throw err;
+		} else {
+            const templated = fn_template(data, obj_data);
+
+
+
+
+			//var servableJs = updateReferencesForServing(data);
+			response.writeHead(200, {'Content-Type': 'text/html'});
+			response.end(templated);
+		}
+	});
+}
+
+
+// File_Server_Resource?
+//  So the resource has code to route to the file and then serve it.
+
+// Also a Templated_HTML resource?
+//  Connects to HTML_Template
+//  Connects to Data_Resource
+//  Populates the HTML_Template data from the Data_Resource
+
+// HTML_Template being a Data_Transformation / Data_Transformation_Resource / Transformation_Resource
+//  Codecs could be another type of Transformation_Resource
+
+// Transformation Resource could / should appear in jsgui3-client. Makes sense on the client too.
+
+// Separate loading of transformation resource, data resource, and template (resource)
+//  The transformation resource can itself load / be provided with the data resource and template resource.
+
+// jsx processing may be the best way (by far)?
+
+// or jsui templates?
+//  jsx may seem / be easiest at this stage for long term expansion and integration.
+
+
+
+class Site_Template_HTML extends Resource {
+
+	constructor(spec) {
+		super(spec);
+
+		this.meta.set('custom_paths', new Data_Object({}));
+		// Those are custom file paths.
+
+		// could have a collection of directories, indexed by name, that get served.
+
+		// Index the collection by string value?
+		this.meta.set('served_directories', new Collection({'index_by': 'name'}));
+	}
+	'start'(callback) {
+		callback(null, true);
+	}
+	'set_custom_path'(url, file_path) {
+		// But change the URL to have a smiley face instead of fullstops
+		//console.log('url', url);
+		var escaped_url = url.replace(/\./g, '☺');
+		//console.log('escaped_url', escaped_url);
+
+		//this.meta.set('custom_paths.' + escaped_url, file_path);
+		var custom_paths = this.meta.get('custom_paths');
+		//console.log('custom_paths', custom_paths);
+		custom_paths.set(escaped_url, file_path);
+
+	}
+	'serve_directory'(path) {
+		// Serves that directory, as any files given in that directory can be served from /js
+		var served_directories = this.meta.get('served_directories');
+		//console.log('served_directories ' + stringify(served_directories));
+		//served_directories.push(path);
+		served_directories.push({
+			'name': path
+		});
+		//console.log('served_directories ' + stringify(served_directories));
+		//console.log('path ' + path);
+
+		//throw 'stop';
+
+	}
+	'process'(req, res) {
+		//console.log('Site_Static_HTML processing');
+		var remoteAddress = req.connection.remoteAddress;
+		var custom_paths = this.custom_paths;
+		var rurl = req.url;
+		var pool = this.pool;
+		// should have a bunch of resources from the pool.
+		//var pool_resources = pool.resources();
+		//console.log('pool_resources ' + stringify(pool_resources));
+
+		var url_parts = url.parse(req.url, true);
+		//console.log('url_parts ' + stringify(url_parts));
+		var splitPath = url_parts.path.substr(1).split('/');
+		//console.log('resource site css splitPath ' + stringify(splitPath));
+
+		if (rurl.substr(0, 1) == '/') rurl = rurl.substr(1);
+		rurl = rurl.replace(/\./g, '☺');
+		//console.log('rurl ' + rurl);
+
+		if (rurl == '') rurl = '/';
+		var custom_response_entry = custom_paths.get(rurl);
+		//console.log('Static HTML Resource process url', req.url);
+
+
+		//console.log('custom_response_entry ' + stringify(custom_response_entry));
+
+		if (custom_response_entry) {
+			var tcr = tof(custom_response_entry);
+			//console.log('tcr ' + tcr);
+			if (tcr == 'data_value') {
+				var val = custom_response_entry.value();
+				//console.log('val ' + val);
+				var tval = tof(val);
+				if (tval === 'string') {
+					// then it should be a local file path, serve it.
+                    // need to specify a template resource / algorithm.
+
+					serve_html_file_from_disk(val, res);
+				}
+			}
+			//throw 'stop';
+		} else {
+			//console.log('splitPath', splitPath);
+			//console.log('splitPath.length', splitPath.length);
+
+			if (splitPath.length > 0) {
+
+				// Can check for /js folder.
+				//  There will be some fixed resources for the site.
+				//   They will be served by Resource objects.
+				//  There may be some overlap of resources, with there being some very fixed purpose
+				//   specific resources that could duplicate some features of the more general ones.
+				//   Eventually, some of the code from the more specific resources will be
+				//   replacable with code from the more general ones.
+
+				// Site_JavaScript resource
+				//  Will serve JavaScript files needed for the site.
+				//   Could become more advanced at some points, serving particular builds.
+
+				if (splitPath.length == 1) {
+					if (splitPath[0] == '') {
+						// Serve the default page.
+						// serve index.html
+						//serve_html_file_from_disk('./index.html', res);
+						serve_html_file_from_disk('index.html', res);
+
+
+
+
+					}
+				} else {
+					if (splitPath[0] == 'html') {
+						//var sjs = pool.get_resource('Site JavaScript');
+						//console.log('sjs ' + sjs);
+
+						//throw 'stop';
+
+						// determine the name of the file to serve, serve that file
+						//  Could use some more general kind of file server.
+
+						if (splitPath.length > 1) {
+							if (splitPath.length == 2) {
+								var fileName = splitPath[1];
+								//console.log('url_parts.path ' + url_parts.path);
+								var filePath = url_parts.path.substr(1);
+								//console.log('module.uri ' + module.uri);
+
+								// No, need the current module's relative path....
+
+								//var val2 =  path.dirname(module.uri);
+								//console.log('val2 ' + val2);
+								//throw '9) stop';
+
+								//var diskPath = val2 + '/../css/' + fileName;
+								var diskPath = '../../ws/css/' + fileName;
+
+								serve_html_file_from_disk(diskPath, res);
+							} else {
+								if (splitPath.length == 3) {
+
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+module.exports = Site_Template_HTML;

package/roadmap.md

@@ -1,75 +1,75 @@
-To fix:
-CSS bundled from the JS.
-
-Generally tidy it up.
-Be clear about the responsibilities of the different parts of it.
-Make a documentation, demo and marketing/promotion/awareness server app within this repo (a simple one at least)
-  But just specific to jsgui3-server, could be used in a larger webapp for jsgu3 doc, demo, promo
-
-
-
-Make it work as a stand-alone application.
-  It's already quite a large codebase. Make use of existing code and expand somewhat further.
-Start it, get it serving a directory easily.
-Start it, access it through admin pages.
-  Admin interface showing by default.
-
-Admin web interfaces seem like a piece of progress that the groundwork is in place for.
-
-node server start 80
-node server stop 80
-
-Command line interfaces to interact with a jsgui server
-
-node server modify 80 upload \[path\] as index.html
-  or similar?
-
-node server get 80
-
-node server 80
-  starts it
-  shows a cli for it...
-  a cli app?
-  a terminal app?
-
-
-Server will start with a default holding page.
-Server will be in a very simple configuration.
-Single html response for all requests...?
-
-
-Server with admin interface available, and admin interface allowing it to bundle / serve selected content.
-Also want to make use of simple and stable API.
-
-Want to make the server admin page(s) with panels.
-Would be a nice place for a decent web ui.
-
-More advanced and user-friendly functionality out-of-the-box.
-A file manager interface would be cool.
-Maybe would need to use file system resource
-Could work on remote file system too.
-
-Or make clear this is the core of the server?
-jsgui3-server-core perhaps?
-
-A Default server? Could also include file management.
-
-
-jsgui3-website could be helpful
-a .deploy function
-possibly the website could be hosted over multiple different servers, deployment could work for that.
-The website would not only be within the server.
-
-Could have a deployment wizard.
-
-
-
-
-
-
-
-
-
-
-
-
+To fix:
+CSS bundled from the JS.
+
+Generally tidy it up.
+Be clear about the responsibilities of the different parts of it.
+Make a documentation, demo and marketing/promotion/awareness server app within this repo (a simple one at least)
+  But just specific to jsgui3-server, could be used in a larger webapp for jsgu3 doc, demo, promo
+
+
+
+Make it work as a stand-alone application.
+  It's already quite a large codebase. Make use of existing code and expand somewhat further.
+Start it, get it serving a directory easily.
+Start it, access it through admin pages.
+  Admin interface showing by default.
+
+Admin web interfaces seem like a piece of progress that the groundwork is in place for.
+
+node server start 80
+node server stop 80
+
+Command line interfaces to interact with a jsgui server
+
+node server modify 80 upload \[path\] as index.html
+  or similar?
+
+node server get 80
+
+node server 80
+  starts it
+  shows a cli for it...
+  a cli app?
+  a terminal app?
+
+
+Server will start with a default holding page.
+Server will be in a very simple configuration.
+Single html response for all requests...?
+
+
+Server with admin interface available, and admin interface allowing it to bundle / serve selected content.
+Also want to make use of simple and stable API.
+
+Want to make the server admin page(s) with panels.
+Would be a nice place for a decent web ui.
+
+More advanced and user-friendly functionality out-of-the-box.
+A file manager interface would be cool.
+Maybe would need to use file system resource
+Could work on remote file system too.
+
+Or make clear this is the core of the server?
+jsgui3-server-core perhaps?
+
+A Default server? Could also include file management.
+
+
+jsgui3-website could be helpful
+a .deploy function
+possibly the website could be hosted over multiple different servers, deployment could work for that.
+The website would not only be within the server.
+
+Could have a deployment wizard.
+
+
+
+
+
+
+
+
+
+
+
+