jsgui3-server 0.0.121 → 0.0.123

package/publishers/http-js-publisher.js

@@ -1,136 +1,136 @@
-
-
-// Publishes the HTML format.
-
-
-const HTTP_Publisher = require('./http-publisher');
-
-// This part will process the requests and responses, not the JS resource itself.
-
-
-
-class HTTP_JS_Publisher extends HTTP_Publisher {
-    constructor(spec) {
-
-        // Should probably take one or more JS Resources.
-
-
-
-        super(spec);
-    }
-
-    // Will publish HTML documents over HTTP, but seems as though it would need to be configured / called with
-    //  something to render as well as a rendering engine and parameters.
-
-    // compilation = rendering? not exactly.
-
-    // handle_http()
-
-	'handle_http'(req, res) {
-
-		// Will the resource itself process the requests? Maybe only the Resource Publisher should do that.
-		//  A greater level of abstraction there, more splitting of responsibilities.
-
-
-
-
-
-		console.log('HTTP_JS_Publisher processing req.url', req.url);
-		var remoteAddress = req.connection.remoteAddress;
-		var custom_paths = this.custom_paths;
-		var rurl = req.url.replace(/\./g, '☺');
-		var custom_response_entry = custom_paths[rurl];
-		var pool = this.pool;
-		if (custom_response_entry) {
-			const ae = req.headers['accept-encoding'];
-			let data_to_serve;
-			let o_head = {
-				'Content-Type': 'text/javascript'
-			}
-			if (ae.includes('gzip')) {
-				o_head['Content-Encoding'] = 'gzip';
-				data_to_serve = custom_response_entry._.gzip;
-			} else {
-				data_to_serve = custom_response_entry._.raw;
-			}
-			res.writeHead(200, o_head);
-			res.end(data_to_serve);
-		} else {
-			//var served_directories = this.served_directories;
-			//console.log('served_directories', served_directories);
-			var url_parts = url.parse(req.url, true);
-			//console.log('url_parts ' + stringify(url_parts));
-			var splitPath = url_parts.path.substr(1).split('/');
-
-			var wildcard_value = req.params.wildcard_value;
-			//console.log('*** wildcard_value', wildcard_value);
-
-			if (wildcard_value == 'web/require.js') {
-
-			} else {
-				var disk_path = path.dirname(require.main.filename) + '/' + 'js/' + wildcard_value;
-				var compress = false;
-
-
-				//console.log('disk_path', disk_path);
-
-				if (compress) {
-					throw 'NYI with Babel';
-
-				} else {
-					// try to load it from the project's js path.
-					//console.log('disk_path', disk_path);
-					var project_js_path = 'js/' + wildcard_value;
-					//console.log('project_js_path', project_js_path);
-
-					fs2.load_file_as_string(disk_path, function (err, str_js) {
-						if (err) {
-							console.log('error loading from project_js_path: ', project_js_path);
-							console.log(err);
-						} else {
-							// Have loaded the js from the project path, we can serve it.
-							console.log('have loaded js');
-							// serve the js.
-
-
-							//res.writeHead(200, {'Content-Type': 'text/javascript'});
-							// Could possibly stream it from disk instead, that would likely be more efficient.
-							console.log('str_js.length', str_js.length);
-
-
-							// use gzip in many cases.
-							// want to support that.
-
-							// a streaming middleware fn could work...?
-
-							zlib.deflate(str_js, function (err, buffer) {
-								console.log('deflated buffer.length', buffer.length);
-
-
-								if (err) throw err;
-								res.writeHead(200, {
-									'Content-Encoding': 'deflate',
-									'Content-Type': 'text/javascript'
-								});
-								res.end(buffer);
-								//res.writeHead(200, {'Content-Type': 'text/javascript'});
-								//response.end(servableJs);
-								//res.end(minified.code);
-							});
-
-
-							//response.end(servableJs);
-							//res.end(str_js);
-							//throw 'stop';
-						}
-					})
-				}
-			}
-		}
-	}
-
-
-
-}
-
+
+
+// Publishes the HTML format.
+
+
+const HTTP_Publisher = require('./http-publisher');
+
+// This part will process the requests and responses, not the JS resource itself.
+
+
+
+class HTTP_JS_Publisher extends HTTP_Publisher {
+    constructor(spec) {
+
+        // Should probably take one or more JS Resources.
+
+
+
+        super(spec);
+    }
+
+    // Will publish HTML documents over HTTP, but seems as though it would need to be configured / called with
+    //  something to render as well as a rendering engine and parameters.
+
+    // compilation = rendering? not exactly.
+
+    // handle_http()
+
+	'handle_http'(req, res) {
+
+		// Will the resource itself process the requests? Maybe only the Resource Publisher should do that.
+		//  A greater level of abstraction there, more splitting of responsibilities.
+
+
+
+
+
+		console.log('HTTP_JS_Publisher processing req.url', req.url);
+		var remoteAddress = req.connection.remoteAddress;
+		var custom_paths = this.custom_paths;
+		var rurl = req.url.replace(/\./g, '☺');
+		var custom_response_entry = custom_paths[rurl];
+		var pool = this.pool;
+		if (custom_response_entry) {
+			const ae = req.headers['accept-encoding'];
+			let data_to_serve;
+			let o_head = {
+				'Content-Type': 'text/javascript'
+			}
+			if (ae.includes('gzip')) {
+				o_head['Content-Encoding'] = 'gzip';
+				data_to_serve = custom_response_entry._.gzip;
+			} else {
+				data_to_serve = custom_response_entry._.raw;
+			}
+			res.writeHead(200, o_head);
+			res.end(data_to_serve);
+		} else {
+			//var served_directories = this.served_directories;
+			//console.log('served_directories', served_directories);
+			var url_parts = url.parse(req.url, true);
+			//console.log('url_parts ' + stringify(url_parts));
+			var splitPath = url_parts.path.substr(1).split('/');
+
+			var wildcard_value = req.params.wildcard_value;
+			//console.log('*** wildcard_value', wildcard_value);
+
+			if (wildcard_value == 'web/require.js') {
+
+			} else {
+				var disk_path = path.dirname(require.main.filename) + '/' + 'js/' + wildcard_value;
+				var compress = false;
+
+
+				//console.log('disk_path', disk_path);
+
+				if (compress) {
+					throw 'NYI with Babel';
+
+				} else {
+					// try to load it from the project's js path.
+					//console.log('disk_path', disk_path);
+					var project_js_path = 'js/' + wildcard_value;
+					//console.log('project_js_path', project_js_path);
+
+					fs2.load_file_as_string(disk_path, function (err, str_js) {
+						if (err) {
+							console.log('error loading from project_js_path: ', project_js_path);
+							console.log(err);
+						} else {
+							// Have loaded the js from the project path, we can serve it.
+							console.log('have loaded js');
+							// serve the js.
+
+
+							//res.writeHead(200, {'Content-Type': 'text/javascript'});
+							// Could possibly stream it from disk instead, that would likely be more efficient.
+							console.log('str_js.length', str_js.length);
+
+
+							// use gzip in many cases.
+							// want to support that.
+
+							// a streaming middleware fn could work...?
+
+							zlib.deflate(str_js, function (err, buffer) {
+								console.log('deflated buffer.length', buffer.length);
+
+
+								if (err) throw err;
+								res.writeHead(200, {
+									'Content-Encoding': 'deflate',
+									'Content-Type': 'text/javascript'
+								});
+								res.end(buffer);
+								//res.writeHead(200, {'Content-Type': 'text/javascript'});
+								//response.end(servableJs);
+								//res.end(minified.code);
+							});
+
+
+							//response.end(servableJs);
+							//res.end(str_js);
+							//throw 'stop';
+						}
+					})
+				}
+			}
+		}
+	}
+
+
+
+}
+
 module.exports = HTTP_JS_Publisher;

package/publishers/http-observable-publisher.js

@@ -1,125 +1,125 @@
-const jsgui = require('jsgui3-html');
-
-const {
-    Evented_Class
-} = jsgui;
-
-const {
-    observable
-} = require('fnl');
-
-const HTTP_Publisher = require('./http-publisher');
-
-// Evented_Class_Publisher?
-//  Evented_Publisher
-
-// Want to do this over websockets too.
-//  Should be a single ws point.
-//   Could give out conntection keys alongside the HTTP request.
-//    All the security needed - give out a 256 bit key in the HTML doc, require it to open the websocket connection.
-//     Seems simple, would work with a single process auth provider, then could have centralised auth and token issuance and checking.
-
-
-class Observable_Publisher extends HTTP_Publisher {
-    constructor(spec) {
-        super(spec);
-        let obs, schema;
-        // needs to hook into the server though...
-        if (spec.next && spec.complete && spec.error) {
-            obs = spec;
-        } else {
-
-            if (spec.obs) {
-                obs = spec.obs;
-            } else {
-                throw 'No observable found.';
-            }
-
-            //let {schema} = spec;
-            
-            schema = spec.schema;
-
-            //console.trace();
-            //throw 'NYI';
-        }
-        // need to be able to process (http) requests.
-        // reobserve that observable to prevent too many events being attached.
-
-        // reobserve
-        //  code here could be written as resobserve function.
-        //   or just obs on an existing obs?
-
-        let obs2 = observable((next, complete, error) => {
-            obs.on('next', data => {
-                next(data);
-            })
-            return [];
-        })
-        this.type = 'observable';
-
-        // Also should publish when it's over.
-
-        /*
-
-        => Request
-        GET /stream HTTP/1.1 
-        Host: example.com
-        Accept: text/event-stream
-
-        <= Response
-        HTTP/1.1 200 OK 
-        Connection: keep-alive
-        Content-Type: text/event-stream
-        Transfer-Encoding: chunked
-
-        retry: 15000 
-
-        data: First message is a simple string. 
-
-        data: {"message": "JSON payload"} 
-
-        event: foo 
-        data: Message of type "foo"
-
-        id: 42 
-        event: bar
-        data: Multi-line message of
-        data: type "bar" and id "42"
-
-        id: 43 
-        data: Last message, id "43"
-        
-1
-2
-3
-4
-event: message\n
-data: this is an important message\n
-data: that has two lines\n
-\n
-
-        */
-
-        
-        this.handle_http = (req, res) => {
-            // need to handle observable http request.
-            // Begin sending to that connection...
-            // Following SSE would be nice.
-            res.writeHead(200, {
-                'Content-Type': 'text/event-stream',
-                'Transfer-Encoding': 'chunked',
-                //'Trailer': 'Content-MD5'
-            });
-            res.write('OK\n');
-            let obs2_handler = data => {
-                //console.log('data', data);
-                let s_data = JSON.stringify(data);
-                //res.write(s_data + '\n');
-                res.write('event: message\ndata:' + s_data + '\n\n');
-            }
-            obs2.on('next', obs2_handler);
-        }
-    }
-}
-
+const jsgui = require('jsgui3-html');
+
+const {
+    Evented_Class
+} = jsgui;
+
+const {
+    observable
+} = require('fnl');
+
+const HTTP_Publisher = require('./http-publisher');
+
+// Evented_Class_Publisher?
+//  Evented_Publisher
+
+// Want to do this over websockets too.
+//  Should be a single ws point.
+//   Could give out conntection keys alongside the HTTP request.
+//    All the security needed - give out a 256 bit key in the HTML doc, require it to open the websocket connection.
+//     Seems simple, would work with a single process auth provider, then could have centralised auth and token issuance and checking.
+
+
+class Observable_Publisher extends HTTP_Publisher {
+    constructor(spec) {
+        super(spec);
+        let obs, schema;
+        // needs to hook into the server though...
+        if (spec.next && spec.complete && spec.error) {
+            obs = spec;
+        } else {
+
+            if (spec.obs) {
+                obs = spec.obs;
+            } else {
+                throw 'No observable found.';
+            }
+
+            //let {schema} = spec;
+            
+            schema = spec.schema;
+
+            //console.trace();
+            //throw 'NYI';
+        }
+        // need to be able to process (http) requests.
+        // reobserve that observable to prevent too many events being attached.
+
+        // reobserve
+        //  code here could be written as resobserve function.
+        //   or just obs on an existing obs?
+
+        let obs2 = observable((next, complete, error) => {
+            obs.on('next', data => {
+                next(data);
+            })
+            return [];
+        })
+        this.type = 'observable';
+
+        // Also should publish when it's over.
+
+        /*
+
+        => Request
+        GET /stream HTTP/1.1 
+        Host: example.com
+        Accept: text/event-stream
+
+        <= Response
+        HTTP/1.1 200 OK 
+        Connection: keep-alive
+        Content-Type: text/event-stream
+        Transfer-Encoding: chunked
+
+        retry: 15000 
+
+        data: First message is a simple string. 
+
+        data: {"message": "JSON payload"} 
+
+        event: foo 
+        data: Message of type "foo"
+
+        id: 42 
+        event: bar
+        data: Multi-line message of
+        data: type "bar" and id "42"
+
+        id: 43 
+        data: Last message, id "43"
+        
+1
+2
+3
+4
+event: message\n
+data: this is an important message\n
+data: that has two lines\n
+\n
+
+        */
+
+        
+        this.handle_http = (req, res) => {
+            // need to handle observable http request.
+            // Begin sending to that connection...
+            // Following SSE would be nice.
+            res.writeHead(200, {
+                'Content-Type': 'text/event-stream',
+                'Transfer-Encoding': 'chunked',
+                //'Trailer': 'Content-MD5'
+            });
+            res.write('OK\n');
+            let obs2_handler = data => {
+                //console.log('data', data);
+                let s_data = JSON.stringify(data);
+                //res.write(s_data + '\n');
+                res.write('event: message\ndata:' + s_data + '\n\n');
+            }
+            obs2.on('next', obs2_handler);
+        }
+    }
+}
+
 module.exports = Observable_Publisher;

package/publishers/http-publisher.js

@@ -1,54 +1,54 @@
-//const { Publisher } = require('jsgui3-html');
-
-const {Evented_Class} = require('lang-tools');
-
-// Could have this as the general purpose HTTP publishing component / system / part of the system.
-
-
-
-// Some kind of mapping between what the response asks for and the functions to get the results along with the parameters to call them with.
-
-
-
-class HTTP_Publisher extends Evented_Class {
-    constructor(spec) {
-        super(spec)
-
-        /*
-        this.handle_http = (req, res) => {
-            
-            
-
-        }
-        */
-    }
-    handle_http(req, res) {
-        console.trace();
-        throw 'HTTP_Publisher: Use handle_http of subclass.';
-        // Determine input content type (if any)
-        // Headers, auth
-        //  Then get more of a programmatic model of what it requires to be done.
-        // 
-
-
-        // Use the app router to determine where the request is to go.
-
-        const do_response = () => {
-            res.writeHead(200, {
-                //'Content-Type': 'text/event-stream',
-                'Transfer-Encoding': 'chunked',
-                //'Trailer': 'Content-MD5'
-            });
-            res.write('OK\n');
-            let obs2_handler = data => {
-                //console.log('data', data);
-                let s_data = JSON.stringify(data);
-                //res.write(s_data + '\n');
-                res.write('event: message\ndata:' + s_data + '\n\n');
-            }
-            obs2.on('next', obs2_handler);
-        }
-    }
-}
-
+//const { Publisher } = require('jsgui3-html');
+
+const {Evented_Class} = require('lang-tools');
+
+// Could have this as the general purpose HTTP publishing component / system / part of the system.
+
+
+
+// Some kind of mapping between what the response asks for and the functions to get the results along with the parameters to call them with.
+
+
+
+class HTTP_Publisher extends Evented_Class {
+    constructor(spec) {
+        super(spec)
+
+        /*
+        this.handle_http = (req, res) => {
+            
+            
+
+        }
+        */
+    }
+    handle_http(req, res) {
+        console.trace();
+        throw 'HTTP_Publisher: Use handle_http of subclass.';
+        // Determine input content type (if any)
+        // Headers, auth
+        //  Then get more of a programmatic model of what it requires to be done.
+        // 
+
+
+        // Use the app router to determine where the request is to go.
+
+        const do_response = () => {
+            res.writeHead(200, {
+                //'Content-Type': 'text/event-stream',
+                'Transfer-Encoding': 'chunked',
+                //'Trailer': 'Content-MD5'
+            });
+            res.write('OK\n');
+            let obs2_handler = data => {
+                //console.log('data', data);
+                let s_data = JSON.stringify(data);
+                //res.write(s_data + '\n');
+                res.write('event: message\ndata:' + s_data + '\n\n');
+            }
+            obs2.on('next', obs2_handler);
+        }
+    }
+}
+
 module.exports = HTTP_Publisher;