jsgui3-server 0.0.80 → 0.0.83

package/old/single-control-server.js

@@ -21,54 +21,26 @@ const each = jsgui.each;
 //console.log('post require jsgui');
 //var Start_Stop_Toggle_Button = require('../controls/start-stop-toggle-button');
 const is_array = jsgui.is_array;
-var Server = require('./server');
-var Website_Resource = require('./resources/website-resource');
+var Server = require('../server');
+var Website_Resource = require('../resources/website-resource');
 var port = 80;
 //console.log('!!Server', !!Server);
 //console.log('Object.keys(Server)', Object.keys(Server));
-var Server_Page_Context = require('./page-context');
+var Server_Page_Context = require('../page-context');
 
 // js_mode option
 //  compress
 //  debug
 //  (standard)
 
-// Want to get the library compressed sizes down. Particulatly client. Can do much more with oext.
+// Assumes port 80 for the moment, but want control over ports.
+//  May have / need dedicated websocket port, maybe https, secure websocket?
 
+// Will need to be done in a very different way, if at all.
+//  jsgui3-server is now written to (more) easily publish a single control as a web page.
 
-
-/*
-var server = new Server({
-    '*': {
-        'name': 'html-server'
-    }
-});
-
-*/
-/*
-var resource_pool = root_server.resource_pool;
-// link these getters with the resource pool resource getters?
-let app_server = resource_pool['HTML Server'];
-//console.log('app_server', app_server);
-//
-
-//console.log('app_server.resource_names', app_server.resource_names);
-//console.log('!!app_server.resource_pool', !!app_server.resource_pool);
-let js = app_server.resource_pool['Site JavaScript'];
-*/
-
-//console.log('Server', Server);
-
-// And choose the CSS file / files to send it.
-//  Could send basic jsgui css by default
-//  Then there would be app css on top of that.
-
-// Authenticated_Server?
-//  Has got authentication mechanisms as a wrapper for the controls inside.
-
-
-// Want to be able to set up icons as well.
-
+// Some code concerning cutting out client code could help.
+//  However, proper bundling may be better.
 
 
 class Single_Control_Server extends Server {
@@ -95,12 +67,16 @@ class Single_Control_Server extends Server {
                     throw 'Single_Control_Server needs a Ctrl property'
                 }
             }
+
+
             if (spec.js_mode) this.js_mode = spec.js_mode;
             if (spec.js_client) this.js_client = spec.js_client;
-            // deliver app specific css
-            // an obj
+            if (spec.context_data) this.context_data = spec.context_data;
             if (spec.css) this.css = spec.css;
-            if (spec.icons) this.icons = spec.icons;
+
+            // Not handling icons in the spec(yet). Now using load_icon_set.
+            //if (spec.icons) this.icons = spec.icons;
+
             if (spec.include_server_ref_in_page_context) {
                 this.include_server_ref_in_page_context = spec.include_server_ref_in_page_context;
             }
@@ -118,13 +94,11 @@ class Single_Control_Server extends Server {
         var app = new Website_Resource({
             'name': 'html-server'
         });
-
         // will need to keep access to the server?
         //  server_page_context keeping access to the server?
 
         // some place to keep variables on the server.
         //  Especially when we are not coding any / much server-side logic.
-
         // server.shared
         //  want an object that is shared between all server instances.
 
@@ -132,7 +106,6 @@ class Single_Control_Server extends Server {
         
         // Maybe make something like Resource_Pool but simpler?
         //  Less prescriptive, but allowing a more complex api...?
-
         // page_context.shared
         //  shared with the server
         //  shared with all page contexts.
@@ -146,11 +119,18 @@ class Single_Control_Server extends Server {
     }
 
     // Could start it up with a client_js reference
+    // be able to chose the port(s) as well?
+
+    // HTTPS and other protocols?
 
     'start' (callback) {
+
+        const {context_data} = this;
+
+        // Want the right lower level abstractions for this. And similar.
+
         //throw 'stop';
         //var resource_pool = this.resource_pool;
-
         var resource_pool = this.app_server.resource_pool;
         var server_router = this.resource_pool.get_resource('Server Router');
         // Build the client js and include that.
@@ -162,80 +142,49 @@ class Single_Control_Server extends Server {
         let js = this.app_server.resource_pool['Site JavaScript'];
         let css = this.app_server.resource_pool['Site CSS'];
         let imgs = this.app_server.resource_pool['Site Images'];
-
-
-
-        // will look into the resource publisher to see what is published.
-
-        // serve package with replacement options.
-        // // the activate app function.
-        //  Can be put into place in the served JS.
-
-        // with replacement option within serve_package
-
         let o_serve_package = {
             //'babel': 'mini'
         }
 
-        // babel option.
-        // Activation should be defined
-        //  Or there is some default activation in the client.js
-        //  It has the maps of controls and Controls
-        //   Then can activate these controls.
-        //    There should maybe be some more data services in the client.
-        //  Could make the client more miniature and modular once it works, and then incorporate react.
-        // Data-Resource would be general enough to work on both.
-        //  The client data resources could then direct their requests to the server ones.
-        // Could make a resource-pool for both client and server
-
-        //console.log('this.activate_app', this.activate_app);
-        //throw 'stop';
-
-        // Should do this before the babel compilation. Think that's the sequence anyway.
-        //  Not sure why it's not working.
+        // Other way(s) of doing this now.
         if (this.activate_app) {
             o_serve_package.replace = {
                 '/* -- ACTIVATE-APP -- */': this.activate_app.toString()
             }
             //
         }
-        // want it to serve with debug code map
-        //  for the moment
-        // want that to be easier to do with a --debug option.
-        //  should read command line options.
         o_serve_package.js_mode = 'mini';
         if (this.js_mode) {
             o_serve_package.js_mode = this.js_mode;
         } else {
             //o_serve_package.babel = 'mini';
         }
-        // need to minify the js.
-        //  Also, gzip compression as standard.
-        //  Need HTTPS for Brotli - but want to get HTTPS working more, tested online and running.
+        if (this.css) {
+            each(this.css, (path, serve_as) => {
+                css.serve(serve_as, path);
+            })
+        }
 
-        // Need to minify js, reduce file size.
+        
+        // css.serve_package_css
+        //  will get the css from that package?
+        //  or extract the css from the classes in the package directly?
 
-        // Minifying currently breaks it.
 
-        //o_serve_package.js_mode = 'debug';
+        let js_client = this.client_package || this.js_client || 'jsgui3-client';
 
-        // Extra functionality for loading / serving icon files?
-        //  Easily available / usable named icons will be very useful within the app.
-        //  Could be in sprites / pre-loaded.
+        // The removal of server code / recompilation shouldnt make a difference in cases where we give it client-side js to start with.
+        // Have the case of the actual client-side js being given with no transformation needed.
+        //  Can detect whether there is any server-side code and transformation(s) needed...?
 
 
 
 
-        // Not sure how to do the replace when loading from disk.
-        // Give a reference to the package to serve itself.
-        //  example servers - 
-        // serve the css as well.
-        if (this.css) {
-            each(this.css, (path, serve_as) => {
-                css.serve(serve_as, path);
-            })
-        }
-        let js_client = this.client_package || this.js_client || 'jsgui3-client';
+
+
+        //console.log('js_client', js_client);
+        //throw 'stop';
+
         js.serve_package('/js/app.js', js_client, o_serve_package, (err, served) => {
             //var resource_pool = this.resource_pool;
             //console.log('server_router', server_router);
@@ -243,10 +192,9 @@ class Single_Control_Server extends Server {
             if (!server_router) {
                 throw 'no server_router';
             }
-            var routing_tree = server_router.routing_tree;
+            const routing_tree = server_router.routing_tree;
             routing_tree.set('/', (req, res) => {
                 //console.log('root path / request');
-
                 const o_spc = {
                     'req': req,
                     'res': res,
@@ -254,10 +202,11 @@ class Single_Control_Server extends Server {
                 }
 
                 if (this.include_server_ref_in_page_context) o_spc.server = this;
-
-
                 var server_page_context = new Server_Page_Context(o_spc);
-
+                // then merge the context data :)
+                if (this.context_data) {
+                    Object.assign(server_page_context, this.context_data);
+                }
                 // and .server property?
                 //  a different way to get the server info to the components is needed.
 
@@ -266,46 +215,20 @@ class Single_Control_Server extends Server {
                     'context': server_page_context
                 });
                 hd.include_client_css();
-                hd.include_css('/css/basic.css')
+                hd.include_css('/css/basic.css');
+                hd.include_css('/css/controls.css');
 
+                // include compiled css too.
+                //  not much of it yet.
+
+                // Will be a separate CSS file, generated upon app start.
                 if (this.css) {
                     each(this.css, (path, serve_as) => {
                         //css.serve(serve_as, path);
                         hd.include_css('/css/' + serve_as);
                     });
                 }
-
-                // include a js script block, having it set up the 
-                // not include_client_js
-
-                // .include_client_config_js()
-                //  will get the resource config from the resource publisher.
-
-                // including data on published resources in the initial html download would be very useful.
-                //  auto event wiring, so that controls that rely on having this data will have it available.
-
-                // Want to get this to work, then greatly slim down the codebase, or at least delete comments, use some more syntactic sugar.
-
-                // Calling 'publish' would be a good method.
-                //console.log('this.app_server.map_resource_publishers', this.app_server.map_resource_publishers);
-                //console.log('this.app_server.def_resource_publishers', this.app_server.def_resource_publishers);
-
-                // a script block where we assign the resource publishers.
-                //  tell the client what resources are available on the server.
-
-                // include a js script block.
-                // jsgui.register_server_resources({...})
-                // o_def
-                //  an object that describes how the resources are published.
-
-                // app_server.def_resource_publishers
-                //  the urls
-                //   what data it provides / its schema.
-                //  a def from each of the publishers
-                //   with a schema similar to graphql?
-
-                //throw 'stop';
-
+                
                 var body = hd.body;
                 let o_params = this.params || {};
                 Object.assign(o_params, {
@@ -317,10 +240,7 @@ class Single_Control_Server extends Server {
                 ctrl.active();
                 //var ctrl2 = new jsgui.Control({});
                 body.add(ctrl);
-
-                let resources_script = new jsgui.script({
-                    context: server_page_context
-                });
+                
                 // it will be a client-side function.
 
                 // Should not use 'add' here.
@@ -332,31 +252,57 @@ class Single_Control_Server extends Server {
                 hd.include_js('/js/app.js');
 
                 // Would this be a place to register icons?
+                //  and register client data.
 
+                // If we have the client data, we merge these items into the context.
+                //  register_context_data
+                //   because the page_context js object won't have been created yet...
 
-                const strc = new jsgui.String_Control({
-                    context: server_page_context,
+                // create the different statements.
+                //  only put that resources_script in if there is something worth doing.
 
-                    // Won't have access to the context when registering there?
-                    //  Will need to access the client-side context.
-                    //   Setting jsgui.context on the client-side does make sense.
-                    //    There would only be one context per instance of jsgui on the client.
+                // Or even do the CSS compilation and property removal from the JS file, all at the same time?
+                //  Maybe could do it from reference to the client controls too.
 
-                    // Could raise an event on jsgui, which the page_context listens to?
-                    //  The calls need to be set up within the page_context, I think.
+                // Will work out a fairly simple way to compile together tha CSS.
+                //  May have a few methods available, make use of them in different ways / at different levels.
 
-                    // Could just set the def_server_resources property.
-                    //  Then later activation with the page_context could refer to it.
+                let statement_rsr;
+                let statement_context_data;
+                let statements = [];
 
-                    // setting up the def_resource_publishers
-                    //  maybe 'resource' will be a generic term for something in some place.
-                    //   can be non-local, but api will localise its use.
+                // Some data will be sent to the client each time.
+                //  Could possibly deliver some kind of token as well to represent the user.
 
-                    text: `jsgui.register_server_resources(${JSON.stringify(this.app_server.def_resource_publishers)});`
-                });
+                // Number of entries in this.app_server.def_resource_publishers
+
+                if (this.app_server.def_resource_publishers) {
+                    const c = Object.keys(this.app_server.def_resource_publishers).length;
+                    if (c > 0) {
+                        statement_rsr = `jsgui.register_server_resources(${JSON.stringify(this.app_server.def_resource_publishers)});`;
+                        statements.push(statement_rsr);
+                    }
+                }
+
+                if (context_data) {
+                    const c = Object.keys(context_data).length;
+                    if (c > 0) {
+                        statement_context_data = `jsgui.register_context_data(${JSON.stringify(context_data)});`;
+                        statements.push(statement_context_data);
+                    }
+                }
 
-                resources_script.add(strc);
-                body.add(resources_script);
+                if (statements.length > 0) {
+                    let resources_script = new jsgui.script({
+                        context: server_page_context
+                    });
+                    const strc = new jsgui.String_Control({
+                        context: server_page_context,
+                        text: statements.join('')
+                    });
+                    resources_script.add(strc);
+                    body.add(resources_script);
+                }
                 
                 hd.all_html_render(function (err, deferred_html) {
                     if (err) {
@@ -390,11 +336,15 @@ class Single_Control_Server extends Server {
     load_icon_set(path, map_icons) {
         // will load each icon into the image resource.
         //  sequential way of doing this?
-
-
-        
-
-
+        // need to register an image / icon by name within the image resource.
+        //  different version support too?
+        //  track original versions with name.
+        let site_images = this.app_server.resource_pool['Site Images'];
+        //console.log('load_icon_set');
+        //console.log('site_images', site_images);
+        // site_images.load_icon_set?
+        // read each of them from disk individually?
+        site_images.load_icon_set(path, map_icons);
     }
 }
 

package/{single-page-app.js → old/single-page-app.js}

@@ -17,6 +17,8 @@ var Collection = jsgui.Collection;
 var j = jsgui;
 var Class = j.Class;
 
+// Again, jsgui3-server now is better configured to do this out-of-the-box.
+
 class Single_Page_App extends jsgui.Evented_Class {
     constructor(spec) {
         super(spec);

package/{examples/demos → old}/square_box.js

@@ -97,7 +97,7 @@ if (require.main === module) {
 
     // be able to choose the port / ports?
 
-    server.start(function (err, cb_start) {
+    server.start(8080, function (err, cb_start) {
         if (err) {
             throw err;
         } else {

package/package.json

@@ -3,9 +3,9 @@
   "main": "module.js",
   "license": "MIT",
   "dependencies": {
-    "@babel/core": "^7.17.8",
-    "@babel/parser": "7.17.8",
-    "@babel/generator": "^7.17.7",
+    "@babel/core": "^7.17.9",
+    "@babel/parser": "7.17.9",
+    "@babel/generator": "^7.17.9",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-minify": "^0.5.1",
     "browserify": "17.0.0",
@@ -13,12 +13,12 @@
     "cookies": "^0.8.0",
     "fnl": "^0.0.21",
     "fnlfs": "^0.0.24",
-    "jsgui3-client": "^0.0.64",
-    "jsgui3-html": "0.0.89",
-    "lang-mini": "^0.0.24",
+    "jsgui3-client": "^0.0.67",
+    "jsgui3-html": "0.0.95",
+    
     "multiparty": "^4.2.3",
     "ncp": "^2.0.0",
-    "obext": "0.0.22",
+    "obext": "0.0.23",
     "rimraf": "^3.0.2",
     "stream-to-array": "^2.3.0",
     "url-parse": "^1.5.10"
@@ -29,7 +29,8 @@
     "babel-plugin-transform-class": "^0.3.0",
     "babel-plugin-transform-es2015-classes": "^6.24.1",
     "babel-plugin-transform-es2015-object-super": "^6.24.1",
-    "iltorb": "^2.4.3"
+    "iltorb": "^2.4.3",
+    "lang-mini": "^0.0.25"
   },
   "engines": {
     "node": ">=15.0.0"
@@ -40,5 +41,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.80"
+  "version": "0.0.83"
 }

package/page-context.js

@@ -21,7 +21,7 @@ class Server_Page_Context extends jsgui.Page_Context {
 			this.req = spec.request;
 			this.request = spec.request;
 		};
-		if (this.req.auth) {
+		if (this.req && this.req.auth) {
 			this.auth = this.req.auth;
 		}
 		if (spec.res) {

package/publishing/{function-publisher.js → http-function-publisher.js}

@@ -1,4 +1,7 @@
 const jsgui = require('jsgui3-html');
+
+const HTTP_Publisher = require('./http-publisher');
+
 const {
     Evented_Class, tf
 } = jsgui;
@@ -7,6 +10,10 @@ const {
     observable
 } = require('fnl');
 
+// Publishing could use a lower level HTTP_Handling.
+
+
+
 // May need a lot more work for flexibility and auth
 //  Maybe can use middleware.
 
@@ -20,8 +27,11 @@ const {
 
 // Use some more general, lower level HTTP?
 
-class Function_Publisher {
+
+
+class Function_Publisher extends HTTP_Publisher {
     constructor(spec) {
+        super(spec);
         //let fn = this.fn = spec;
         // attach a spec to the function?
         // including a schema or params list for the fn?
@@ -120,7 +130,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/publishing/http-html-page-publisher.js

@@ -0,0 +1,5 @@
+
+
+// Publishes both the HTML format itself as well as the various other (main) data types needed to publish an HTML application,
+//  eg js, css, various image formats, various sound and video formats, fonts.
+

package/publishing/http-html-publisher.js

@@ -0,0 +1,25 @@
+
+
+// Publishes the HTML format.
+
+
+const HTTP_Publisher = require('./http-publisher');
+
+
+class HTTP_HTML_Publisher extends HTTP_Publisher {
+    constructor(spec) {
+        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()
+
+
+
+}
+
+module.exports = HTTP_HTML_Publisher;

package/publishing/http-js-publisher.js

@@ -0,0 +1,25 @@
+
+
+// Publishes the HTML format.
+
+
+const HTTP_Publisher = require('./http-publisher');
+
+
+class HTTP_JS_Publisher extends HTTP_Publisher {
+    constructor(spec) {
+        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()
+
+
+
+}
+
+module.exports = HTTP_JS_Publisher;

package/publishing/{observable-publisher.js → http-observable-publisher.js}

@@ -1,4 +1,5 @@
 const jsgui = require('jsgui3-html');
+
 const {
     Evented_Class
 } = jsgui;
@@ -7,6 +8,8 @@ const {
     observable
 } = require('fnl');
 
+const HTTP_Publisher = require('./http-publisher');
+
 // Evented_Class_Publisher?
 //  Evented_Publisher
 
@@ -17,20 +20,23 @@ const {
 //     Seems simple, would work with a single process auth provider, then could have centralised auth and token issuance and checking.
 
 
-
-
-
-
-class Observable_Publisher {
+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;
-            obs = spec.obs;
+            
             schema = spec.schema;
 
             //console.trace();