jsgui3-server 0.0.81 → 0.0.82

package/module.js

@@ -4,11 +4,13 @@
 //var sockjs = require('sockjs'), jsgui = require('jsgui3-html'),
 const jsgui = require('jsgui3-html')
 const Server_Page_Context = require('./page-context');
+jsgui.Server_Page_Context = Server_Page_Context;
 
 // Login = require('../resource/login'),
 //var Server = {};
 
 const Resource_Publisher = require('./publishing/resource-publisher');
+jsgui.Resource_Publisher = Resource_Publisher;
 jsgui.Server = require('./server');
 jsgui.fs2 = require('./fs2');
 //jsgui.Resource = Resource;

package/package.json

@@ -40,5 +40,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.81"
+  "version": "0.0.82"
 }

package/publishing/function-publisher.js

@@ -120,7 +120,7 @@ class Function_Publisher {
                 const fn_res = fn(obj_input);
                 const tfr = tf(fn_res);
                 
-                console.log('tfr', tfr);
+                //console.log('tfr', tfr);
 
                 if (tfr === 'p') {
                     // promise

package/resources/data-resource.js

@@ -37,6 +37,12 @@ var Collection = jsgui.Collection;
 // Ideally want it like image keys, then options for max size and also quality.
 //  
 
+// Data_HTTP_Resource ?
+
+// Handled with request+response.
+//  What about data that needs to be in page load?
+
+// Maybe assume resources always deal with data?
 
 class Data_Resource extends Resource {
 

package/resources/jsbuilder/test/test_project.js

@@ -27,6 +27,7 @@ const test_lang_mini_project = () => {
     // Worth working with a lower level part of jsgui, such as lang-mini.
     //  lang-mini itself has an external reference.
     // stream the file in.
+    throw 'STOP';
     const lm_path = '../../../../../tools/lang-mini/lang-mini.js'
     
     //const file_path = '../JS_File.js';

package/resources/server-resource-pool.js

@@ -19,6 +19,17 @@ var exec = require('child_process').exec;
 // Perhaps this will have HTTP endpoints as well?
 //  Maybe we can access it through url/resources/
 
+
+// jsgui-html could include a prototype / placeholder Templated HTML => HTML transformer.
+//  Or the class that is the superclass of the class that then gets the rsx or whatever module loaded into it.
+//  Maybe it's a Publisher anyway?
+//   Publisher seems a lot like Transformer.
+
+
+
+
+
+
 // Perhaps a resource publisher, or a few of them could be useful.
 //  HTTP_Resource_Publisher?
 //  Generally publishes a resource over HTTP.

package/resources/website-resource.js

@@ -2,6 +2,9 @@
  * Created by James on 29/07/2014.
  */
 
+// Represents (and is?) a website itself, and its representation available through the Resource system.
+
+
 // Want to get the core resources working and tested.
 //  Want to run a clock website / service to start with.
 //  The server could have a clock, while clients could connect to it and share the information.
@@ -73,6 +76,17 @@ const Observable_Publisher = require("../publishing/observable-publisher");
 const Function_Publisher = require("../publishing/function-publisher");
 //const Data_Resource = require("./data-resource");
 
+// Proxy_Server_Resource possibly.
+//  Note that the client should be able to access a Proxy_Server_Resource if needed.
+//   Could just send request onwards and do same for response.
+//    Buffering rate-limiting proxies too though?
+
+
+//  May help with FirstPoint_Server.
+
+
+
+
 class Website_Resource extends Resource {
   constructor(spec = {}) {
     super(spec);
@@ -118,9 +132,9 @@ class Website_Resource extends Resource {
       }
     };
 
-    if (web_database_resource) {
-      spec_web_admin.web_database = web_database_resource;
-    }
+    //if (web_database_resource) {
+    //  spec_web_admin.web_database = web_database_resource;
+    //}
 
     var img_resource = new Site_Images({
       //'meta': {
@@ -149,9 +163,7 @@ class Website_Resource extends Resource {
         pool: resource_pool
         //}
       });
-
       resource_pool.push(static_html_resource);
-
       // Perhaps set it up with the specific files (automatically)?
       //  Probably with the index.html
     }
@@ -184,7 +196,9 @@ class Website_Resource extends Resource {
     router.set_route("js/*", js_resource, js_resource.process);
     // As well as this, it could get the JavaScript resource to serve the JavaScript from the app's js directory.
     js_resource.serve_directory("js");
+    router.set_route("i/*", img_resource, img_resource.process);
     router.set_route("img/*", img_resource, img_resource.process);
+    router.set_route("imgs/*", img_resource, img_resource.process);
     router.set_route("images/*", img_resource, img_resource.process);
     this.map_resource_publishers = this.map_resource_publishers || {};
     router.set_route("resources/:resource_name/*", this, (req, res) => {
@@ -336,9 +350,7 @@ class Website_Resource extends Resource {
         if (rp.type === 'function') {
             if (rp.schema) def.schema = rp.schema;
         }
-
-    })
-
+    });
     return res;
   }
 

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

@@ -38,6 +38,15 @@ var serve_html_file_from_disk = function(filePath, response) {
 
 // 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_Static_HTML extends Resource {
 
@@ -83,48 +92,33 @@ class Site_Static_HTML extends Resource {
 	}
 	'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);
@@ -195,7 +189,6 @@ class Site_Static_HTML extends Resource {
 								if (splitPath.length == 3) {
 
 								}
-
 							}
 						}
 					}

package/server.js

@@ -11,6 +11,10 @@ Website_Resource = require('./resources/website-resource'),
 Info = require('./resources/local-server-info-resource'),
 Server_Page_Context = require('./page-context'), {Evented_Class, each, tof} = jsgui;
 
+// Operating JSGUI_Server as a proxy server or with improved proxy capabilities may help.
+
+// The router is the same as on the client.
+
 class JSGUI_Server extends Evented_Class {
     constructor(spec = {website: true}, __type_name) {
         // Default operations mode...
@@ -47,6 +51,8 @@ class JSGUI_Server extends Evented_Class {
             });
         }
 
+        // Multiple websites - perhaps proxying to them.
+
         if (is_website) {
             const app = this.app = new Website_Resource({
                 name: 'Website'
@@ -62,6 +68,10 @@ class JSGUI_Server extends Evented_Class {
         return this.resource_pool.resource_names;
     }
 
+    // could have those pairs. Possible websocket ports? websockets uses same ports: 80, 443.
+    // http_port, https_port
+
+
     'start'(port, callback, fnProcessRequest) {
         //throw 'stop';
         // The resource_pool is not just a Data_Value. need to fix some get or create new field value code.
@@ -105,7 +115,8 @@ class JSGUI_Server extends Evented_Class {
                                     //console.log('server_routing_res', server_routing_res);
                                 });
                                 https_server.timeout = 10800000;
-                                https_server.listen(443, ipv4_address);
+                                //https_server.listen(443, ipv4_address);
+                                https_server.listen(port, ipv4_address);
                                 num_to_start--;
                                 if (num_to_start === 0) {
                                     callback(null, true);