jsgui3-server 0.0.83 → 0.0.86

package/examples/square_box.js

@@ -23,13 +23,23 @@ if (require.main === module) {
 
     // then start the server....
     // be able to choose the port / ports?
+    console.log('waiting for server ready event');
+    server.on('ready', () => {
+        console.log('server ready');
 
-    server.start(8080, function (err, cb_start) {
-        if (err) {
-            throw err;
-        } else {
-            console.log('server started');
-        }
-    });
+        // server start will change to observable?
+
+        server.start(8080, function (err, cb_start) {
+            if (err) {
+                throw err;
+            } else {
+                // Should have build it by now...
+    
+                console.log('server started');
+            }
+        });
+    })
+
+    
 
 }

package/examples/square_box_client.js

@@ -1,7 +1,9 @@
-const jsgui = require('jsgui3-html'); // and will replace this with jsgui-client, I presume.
+const jsgui = require('jsgui3-client'); // and will replace this with jsgui-client, I presume.
 const {controls, Control, mixins} = jsgui;
 const {dragable} = mixins;
 
+// Relies on extracting CSS from JS files.
+
 class Demo_UI extends Control {
     constructor(spec) {
         spec.__type_name = spec.__type_name || 'demo_ui';

package/package.json

@@ -4,8 +4,8 @@
   "license": "MIT",
   "dependencies": {
     "@babel/core": "^7.17.9",
-    "@babel/parser": "7.17.9",
     "@babel/generator": "^7.17.9",
+    "@babel/parser": "7.17.9",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-minify": "^0.5.1",
     "browserify": "17.0.0",
@@ -13,9 +13,8 @@
     "cookies": "^0.8.0",
     "fnl": "^0.0.21",
     "fnlfs": "^0.0.24",
-    "jsgui3-client": "^0.0.67",
-    "jsgui3-html": "0.0.95",
-    
+    "jsgui3-client": "^0.0.69",
+    "jsgui3-html": "0.0.96",
     "multiparty": "^4.2.3",
     "ncp": "^2.0.0",
     "obext": "0.0.23",
@@ -41,5 +40,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.83"
+  "version": "0.0.86"
 }

package/publishing/http-website-publisher.js

@@ -5,12 +5,13 @@
 // This is going to take over some of the responsibilities of the old website resource, which was unfocused code that was
 //  doing some of the main / most important parts of serving the website.
 
-const {each, Router} = require('jsgui3-html');
+const {each, Router, tof} = require('jsgui3-html');
 const HTTP_Publisher = require('./http-publisher');
 const {obs} = require('fnl');
 
 
 const Webpage_Bundler = require('./../bundler/webpage-bundler');
+const Bundle = require('./../bundler/bundle');
 
 
 // Now it's the very basics of a website publisher. Quite flexible but could do with more.
@@ -73,125 +74,276 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
         console.log('http-website-publisher disk_path_client_js', disk_path_client_js);
         //throw 'stop';
 
+        // This could be an observable that acts sequentially and async.
+
         const setup_website_publishing = (website) => {
-            // put pages into a router here...
-            //  however, may need to be on the lookout for other content that needs to be bundled with each page in the site.
 
-            // Now let's try bundling an active JS client.
-            // May need to compile / render JSGUI Controls to HTML / full HTML pages.
+            //console.log('website', website);
+            //console.log('website.pages', website.pages);
+            //console.log('website.pages.length()', website.pages.length());
+            //throw 'stop';
 
-            // And unspecified pages such as admin pages?
+            // should the website have a 'main' or 'front' or 'first' page, with it having its HTML rendered?
 
-            each(website.pages, (page => {
-                //console.log('page', page);
-                //console.log('page.name', page.name);
-                //console.log('page.url', page.url);
-                //console.log('page.path', page.path);
-                // Need a common client js file for all of them I think.
-
-                const opts_bundling = {};
-                if (disk_path_client_js) opts_bundling.disk_path_client_js = disk_path_client_js;
-
-                const obs_bundling = Webpage_Bundler.bundle_web_page(page, opts_bundling);
-                //console.log('doing bundling');
-                //console.log('obs_bundling', obs_bundling);
-
-                obs_bundling.on('complete', res => {
-                    //console.log('obs_bundling res', res);
-                    const bundle = res;
-                    console.log('bundle._arr.length', bundle._arr.length);
-                    console.log('Object.keys(bundle)', Object.keys(bundle));
-
-                    if (bundle._arr.length === 1) {
-                        // And check it's HTML inside...?
-
-                        const bundled_item = bundle._arr[0];
-                        console.log('bundled_item', bundled_item);
-
-                        if (bundled_item['content-type']) {
-                            const ct = bundled_item['content-type'];
-                            if (ct === 'text/html') {
-                                const http_serve_html = (req, res) => {
-                                    res.writeHead(200, {
-                                        'Content-Type': 'text/html'
-                                    });
-                                    res.end(bundled_item.value, 'utf-8');
-                                }
-                                router.set_route(bundled_item.path, (req, res) => {
-                                    http_serve_html(req, res);
-                                });
-                            } else {
-                                throw 'NYI';
-                            }
 
-                        } else {
-                            throw 'NYI';
-                        }
+            return obs((next, complete, error) => {
 
-                        // need to create / use the handler for it here.
-                        //  will have various http handler functions to reference and use.
-                        //  will have details of http handling in other files.
+                (async () => {
 
-                        // Maybe use an HTML publisher for this? (if it's HTML).
-                        //  Or publisher by mime type (lookup).
 
-                        // create http handler function....
+                    // not iterating properly through the collection without ._arr.
 
-                        
+                    // May make more sense to have 2 versions,
+                    //  for 1 page
+                    //  for 2+ pages
+                    const opts_bundling = {};
+                    if (disk_path_client_js) opts_bundling.disk_path_client_js = disk_path_client_js;
 
-                    } else {
+                    if (website.pages._arr.length === 0) {
+                        throw 'NYI';
+                    } else if (website.pages._arr.length === 1) {
+                        const page = website.pages._arr[0];
+                        const obs_bundling = Webpage_Bundler.bundle_web_page(page, opts_bundling);
+                        //console.log('doing bundling');
+                        //console.log('obs_bundling', obs_bundling);
+    
+                        //throw 'stop';
+
+                        obs_bundling.on('complete', obs_bundling_res => {
+                            // Should be a Bundle rather than a Buffer?
+
+                            //console.log('obs_bundling res', obs_bundling_res);
+
+                            // Need to have the HTML rendering and HTTP serving here as well.
+
+                            
+
+
+                            //const page_bundle = res;
+
+                            if (obs_bundling_res instanceof Bundle) {
+                                //console.log('1) obs_bundling_res._arr.length', obs_bundling_res._arr.length);
+
+                                // then need to handle the page construction and routing of http requests.
+
+                                console.log('obs_bundling_res._arr.length', obs_bundling_res._arr.length);
+
+                                each(obs_bundling_res, item => {
+                                    //console.log('item', item);
+                                    //console.log('item.path', item.path, item['content-type']);
+        
+                                    if (item['content-type']) {
+                                        const ct = item['content-type'];
+                                        if (ct === 'text/html') {
+                                            const http_serve_html = (req, res) => {
+                                                res.writeHead(200, {
+                                                    'Content-Type': 'text/html'
+                                                });
+                                                res.end(item.value, 'utf-8');
+                                            }
+                                            router.set_route(item.path, (req, res) => {
+                                                http_serve_html(req, res);
+                                            });
+                                        } else {
+                                            const http_serve_any = (req, res) => {
+                                                res.writeHead(200, {
+                                                    'Content-Type': ct
+                                                });
+                                                res.end(item.value, 'utf-8');
+                                            }
+                                            router.set_route(item.path, (req, res) => {
+                                                http_serve_any(req, res);
+                                            });
+        
+                                            //throw 'NYI';
+                                        }
+            
+                                    } else {
+                                        throw 'NYI';
+                                    }
+        
+                                })
 
-                        // Multiple items at multiple paths....
+                                //console.trace();
+                                //throw 'stop';
 
-                        each(bundle, item => {
-                            //console.log('item', item);
-                            console.log('item.path', item.path, item['content-type']);
 
-                            if (item['content-type']) {
-                                const ct = item['content-type'];
-                                if (ct === 'text/html') {
-                                    const http_serve_html = (req, res) => {
-                                        res.writeHead(200, {
-                                            'Content-Type': 'text/html'
-                                        });
-                                        res.end(item.value, 'utf-8');
-                                    }
-                                    router.set_route(item.path, (req, res) => {
-                                        http_serve_html(req, res);
-                                    });
-                                } else {
-                                    const http_serve_any = (req, res) => {
-                                        res.writeHead(200, {
-                                            'Content-Type': ct
-                                        });
-                                        res.end(item.value, 'utf-8');
-                                    }
-                                    router.set_route(item.path, (req, res) => {
-                                        http_serve_any(req, res);
-                                    });
 
-                                    //throw 'NYI';
-                                }
-    
+                                complete(obs_bundling_res);
                             } else {
-                                throw 'NYI';
+
+                                console.log('tof(obs_bundling_res)', tof(obs_bundling_res));
+
+                                console.trace();
+                                throw 'stop';
                             }
 
-                        })
+                            
+
+                        });
+
+                    } else if (website.pages._arr.length > 1) {
+                        throw 'NYI';
+                        for (const page in website.pages._arr) {
+
+                            
+    
+                            // With multiple pages, add page to bundle.
+            
+                            const obs_bundling = Webpage_Bundler.bundle_web_page(page, opts_bundling);
+                            //console.log('doing bundling');
+                            //console.log('obs_bundling', obs_bundling);
+        
+                            //throw 'stop';
+    
+                            obs_bundling.on('complete', res => {
+                                //console.log('obs_bundling res', res);
+                                const page_bundle = res;
+    
+                                console.log('page_bundle._arr.length', page_bundle._arr.length);
+    
+                                //complete(bundle);
+    
+                            });
+            
+        
+                            const old = () => {
+                                obs_bundling.on('complete', res => {
+                                    //console.log('obs_bundling res', res);
+                                    const bundle = res;
+                                    //console.log('bundle._arr.length', bundle._arr.length);
+                                    //console.log('Object.keys(bundle)', Object.keys(bundle));
+                
+                                    if (bundle._arr.length === 1) {
+                                        // And check it's HTML inside...?
+                
+                                        const bundled_item = bundle._arr[0];
+                                        //console.log('bundled_item', bundled_item);
+                
+                                        if (bundled_item['content-type']) {
+                                            const ct = bundled_item['content-type'];
+                                            if (ct === 'text/html') {
+                                                const http_serve_html = (req, res) => {
+                                                    res.writeHead(200, {
+                                                        'Content-Type': 'text/html'
+                                                    });
+                                                    res.end(bundled_item.value, 'utf-8');
+                                                }
+                                                router.set_route(bundled_item.path, (req, res) => {
+                                                    http_serve_html(req, res);
+                                                });
+                                            } else {
+                                                throw 'NYI';
+                                            }
+                
+                                        } else {
+                                            throw 'NYI';
+                                        }
+                
+                                        // need to create / use the handler for it here.
+                                        //  will have various http handler functions to reference and use.
+                                        //  will have details of http handling in other files.
+                
+                                        // Maybe use an HTML publisher for this? (if it's HTML).
+                                        //  Or publisher by mime type (lookup).
+                
+                                        // create http handler function....
+                
+                                        
+                
+                                    } else {
+                
+                                        // Multiple items at multiple paths....
+                
+                                        each(bundle, item => {
+                                            //console.log('item', item);
+                                            //console.log('item.path', item.path, item['content-type']);
+                
+                                            if (item['content-type']) {
+                                                const ct = item['content-type'];
+                                                if (ct === 'text/html') {
+                                                    const http_serve_html = (req, res) => {
+                                                        res.writeHead(200, {
+                                                            'Content-Type': 'text/html'
+                                                        });
+                                                        res.end(item.value, 'utf-8');
+                                                    }
+                                                    router.set_route(item.path, (req, res) => {
+                                                        http_serve_html(req, res);
+                                                    });
+                                                } else {
+                                                    const http_serve_any = (req, res) => {
+                                                        res.writeHead(200, {
+                                                            'Content-Type': ct
+                                                        });
+                                                        res.end(item.value, 'utf-8');
+                                                    }
+                                                    router.set_route(item.path, (req, res) => {
+                                                        http_serve_any(req, res);
+                                                    });
+                
+                                                    //throw 'NYI';
+                                                }
+                    
+                                            } else {
+                                                throw 'NYI';
+                                            }
+                
+                                        })
+                
+                                        //console.trace();
+                                        //throw 'NYI';
+                                    }
+                                })
+                            }
+        
+                            
+        
+        
+        
+        
+                            //console.log(`${property}: ${object[property]}`);
+                        }
+                    } 
 
-                        //console.trace();
-                        //throw 'NYI';
-                    }
-                })
 
-            }));
+                    
 
+
+                    
+                })().catch(err => {
+                    console.error(err);
+                });
+
+                
+
+
+            });
+            // put pages into a router here...
+            //  however, may need to be on the lookout for other content that needs to be bundled with each page in the site.
+
+            // Now let's try bundling an active JS client.
+            // May need to compile / render JSGUI Controls to HTML / full HTML pages.
+
+            // And unspecified pages such as admin pages?
+
+            
             //throw 'NYI';
         }
-
         if (website) {
-            setup_website_publishing(website);
+            const obs_setup = setup_website_publishing(website);
+            obs_setup.on('complete', res_complete => {
+                console.log('setup complete');
 
+
+                this.raise('ready');
+
+                //complete(res_complete);
+
+
+            })
+        } else {
+            this.raise('ready');
         }
 
         // Create a router for the website if it does not already have one.
@@ -200,7 +352,6 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
         // Do we already know all of the pages in the website?
         //  Maybe there are dynamic pages.
 
-
         // Probably best to come up with a bundle here, or at an early stage.
 
         // .prepare_bundle?
@@ -227,6 +378,13 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
         const accept_encoding = req.headers['accept-encoding'];
         const {host} = req.headers;
 
+        // count of routes in the router?
+
+        // router.routes.length?
+        // router.num_routes?
+
+
+
         //console.log('[httpVersion, host, url, statusCode, method, accept_endoding]', [httpVersion, host, url, statusCode, method, accept_encoding]);
 
 
@@ -247,10 +405,6 @@ class HTTP_Website_Publisher extends HTTP_Publisher {
 
         // Possibly the publisher has the router for the website.
 
-
-
-
-
         // May have bundle already prepared anyway.
         //  Possibly the Website or the Website_Resource could do the bundling / building.
         //  Could even bundle into a ZIP file :)

package/resources/jsbuilder/JS_AST/JS_AST_Node_6.0-Type.js

@@ -15,6 +15,8 @@ class JS_AST_Node_Type extends JS_AST_Node_Category_Statement {
         Object.defineProperty(this, 'abbreviated_type', {
             get() { 
                 const abb = type_abbreviations[this.babel.node.type];
+                // Maybe need a load more abbreviations now there are more babel types.
+
                 if (abb) {
                     return abb;
                 } else {

package/resources/jsbuilder/babel/babel_consts.js

@@ -8,17 +8,22 @@ const type_abbreviations = {
     'ArrayPattern': 'ArP',
     'BinaryExpression': 'BE',
     'BlockStatement': 'BS',
+    'BreakStatement': 'BkS',
     'BooleanLiteral': 'BL',
     'CallExpression': 'CE', // change to CaE? Need to change sigs being looked for.
     'ClassBody': 'CB',
+    'CatchClause': 'CC',
     'ClassDeclaration': 'CD',
+    'ClassExpression': 'CE',
     'ClassMethod': 'CM',
     'ConditionalExpression': 'CoE',
     'EmptyStatement': '__',
     'ExpressionStatement': 'ES',
     'File': 'F',
     'ForStatement': 'FS',
+    'ForInStatement': 'FIS',
     'FunctionExpression': 'FE',
+    'FunctionDeclaration': 'FD',
     'Identifier': 'ID',
     'IfStatement': 'IS',
     'LogicalExpression': 'LE',
@@ -32,10 +37,18 @@ const type_abbreviations = {
     'ObjectProperty': 'OPr',
     'Program': 'P',
     'ReturnStatement': 'RS',
+    'RestElement': 'RE',
+    'RegExpLiteral': 'RxL',
+    'SequenceExpression': 'SE',
     'StringLiteral': 'SL',
+    'SwitchCase': 'SC',
+    'SwitchStatement': 'SS',
     'Super': 'S',
-    'ThisExpression': 'TE',
+    'ThisExpression': 'ThE',
+    'TemplateElement': 'TE',
+    'TemplateLiteral': 'TL',
     'ThrowStatement': 'TS',
+    'TryStatement': 'TryS',
     'UnaryExpression': 'UnE',
     'UpdateExpression': 'UpE',
     'VariableDeclaration': 'VDn',