jsgui3-server 0.0.84 → 0.0.85

package/bundler/css-bundler.js

@@ -34,7 +34,15 @@ const Stream = require('stream');
 
 
 
+const bundle_css_from_js = (js_file_path, options = {}) => {
 
+    return obs(async (next, complete, error) => {
+
+        // Go through each file? Just the first?
+        
+    });
+
+}
 
 
 
@@ -44,5 +52,5 @@ class CSS_Bundler extends Bundler {
     }
 }
 
-//CSS_Bundler.bundle_css = bundle_css;
+CSS_Bundler.bundle_css_from_js = bundle_css_from_js;
 module.exports = CSS_Bundler;

package/bundler/js-bundler.js

@@ -33,6 +33,11 @@ const Stream = require('stream');
 
 const bundle_js = (js_file_path, options = {}, callback) => {
 
+    // Could even split a file into its server and client components.
+    // Maybe providing found css would work well here.
+
+
+
     // Returning an observable and not using a callback would work best.
 
     const res = obs((next, complete, error) => {
@@ -58,6 +63,9 @@ const bundle_js = (js_file_path, options = {}, callback) => {
 
             let fileContents = await fnlfs.load(js_file_path);
 
+
+            // Maybe do that post browserify - can read through whole thing to find the css template literals.
+
             // Could use the CSS bundler to scan_js_for_css
             //  Seems as though it would be best as an observable.
 
@@ -122,6 +130,8 @@ const bundle_js = (js_file_path, options = {}, callback) => {
             let buf_js = Buffer.concat(buffers);
             let str_js = buf_js.toString();
 
+            // full browserified (client) js app.
+
             let babel_option = options.babel
             //console.log('babel_option', babel_option);
             if (babel_option === 'es5') {
@@ -173,7 +183,6 @@ const bundle_js = (js_file_path, options = {}, callback) => {
             } else {
                 buf_js = Buffer.from(str_js);
             }
-
             complete(buf_js);
         })();
 

package/bundler/webpage-bundler.js

@@ -36,6 +36,15 @@ const bundle_web_page = (webpage, options = {}) => {
     const {content} = webpage;
 
     let {disk_path_client_js} = options;
+
+
+    // Could use the CSS bundler to extract the css from the JS.
+
+    
+
+    // Could look for the css within disk_path_client_js.
+
+
     //if (options.js_client) js_client_disk_path = 
 
     // Then depending on the content type
@@ -76,9 +85,6 @@ const bundle_web_page = (webpage, options = {}) => {
             //  Or render it with a temporary context?
 
             // Controls with temportary contexts could be useful.
-
-
-
             if (content instanceof Control) {
                 //console.log('content is control');
                 //console.log('content.constructor.name', content.constructor.name);
@@ -111,7 +117,6 @@ const bundle_web_page = (webpage, options = {}) => {
 
                     //console.log('cloned_content', cloned_content);
 
-
                     // The page context may not have a request and response.
                     //  For bundling, won't have one (unless one were made).
 
@@ -135,10 +140,6 @@ const bundle_web_page = (webpage, options = {}) => {
                     //  So when it finds CSS, it can output that.
                     //  A Control's CSS property, within the JS definition.
                     //   That can be output to a CSS file, copied or removed from the JS file.
-
-                    
-
-
                     bundle_js(diskpath_js_client, {
                         'js_mode': 'mini',
                         'babel': 'mini'
@@ -149,6 +150,7 @@ const bundle_web_page = (webpage, options = {}) => {
                         } else {
                             //console.log('res_bundle_js', res_bundle_js);
 
+                            // Could search at this point for class.css properties.
                             res.push({
                                 'path': webpage.path + 'js/app.js',
                                 'value': res_bundle_js,
@@ -197,7 +199,7 @@ const bundle_web_page = (webpage, options = {}) => {
             }
         } else {
 
-            console.log('t_content', t_content);
+            //console.log('t_content', t_content);
 
             if (t_content === 'function') {
 

package/examples/square_box.js

@@ -23,13 +23,19 @@ 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', () => {
+        server.start(8080, function (err, cb_start) {
+            if (err) {
+                throw err;
+            } else {
+                // Should have build it by now...
+    
+                console.log('server started');
+            }
+        });
+    })
 
-    server.start(8080, function (err, cb_start) {
-        if (err) {
-            throw err;
-        } else {
-            console.log('server started');
-        }
-    });
+    
 
 }

package/package.json

@@ -13,8 +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.68",
+    "jsgui3-html": "0.0.96",
     "multiparty": "^4.2.3",
     "ncp": "^2.0.0",
     "obext": "0.0.23",
@@ -40,5 +40,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.84"
+  "version": "0.0.85"
 }

package/publishing/http-website-publisher.js

@@ -73,122 +73,139 @@ 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.
+            return obs(async(next, complete, error) => {
 
-            // And unspecified pages such as admin pages?
+                for (const page in website.pages) {
+
+                    const opts_bundling = {};
+                    if (disk_path_client_js) opts_bundling.disk_path_client_js = disk_path_client_js;
+    
+                    const obs_bundling = await Webpage_Bundler.bundle_web_page(page, opts_bundling);
+                    //console.log('doing bundling');
+                    console.log('obs_bundling', obs_bundling);
+
+                    throw 'stop';
+    
 
-            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');
+                    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';
                                 }
-                                router.set_route(bundled_item.path, (req, res) => {
-                                    http_serve_html(req, res);
-                                });
+        
+                                // 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 {
-                                throw 'NYI';
+        
+                                // 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';
                             }
+                        })
+                    }
 
-                        } 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']);
+                    //console.log(`${property}: ${object[property]}`);
+                }
 
-                            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';
-                            }
+            });
+            // 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.trace();
-                        //throw 'NYI';
-                    }
-                })
+            // And unspecified pages such as admin pages?
 
-            }));
+            
             //throw 'NYI';
         }
         if (website) {
             setup_website_publishing(website);
+        } else {
+            this.raise('ready');
         }
 
         // Create a router for the website if it does not already have one.

package/roadmap.md

@@ -1,3 +1,7 @@
+To fix:
+CSS bundled from the JS.
+
+
 Make it work as a stand-alone application.
 Start it, get it serving a directory easily.
 Start it, access it through admin pages.

package/server.js

@@ -236,9 +236,19 @@ class JSGUI_Server extends Evented_Class {
 
 
                 const ws_publisher = new HTTP_Website_Publisher(opts_ws_publisher);
+
+                // but need to wait until that website publisher is ready.
+
+
+
+
                 // ws publisher could have website admin (web) tools.
                 //  website admin web interface.
 
+                ws_publisher.on('ready', () => {
+
+                });
+
 
 
 
@@ -254,6 +264,9 @@ class JSGUI_Server extends Evented_Class {
                 // ws_publisher.start();
             }
             current();
+
+            
+
         }
 
         // a 'router' property that returns the server router.

package/website/website.js

@@ -3,6 +3,32 @@ const {tof, HTML_Document} = jsgui;
 
 const oext = require('obext');
 
+// Should maybe become its own module.
+
+// jsgui3-website and jsgui3-webpage
+// jsgui3-application
+// jsgui3-ui-app
+// jsgui3-app may be enough
+//   could build / deploy it to phonegap / other native app wrapper.
+//   And could deploy a jsgui3-app as a website...?
+//   Deploy same app to other platforms?
+// possibly jsgui3-bundler could bundle a website for different uses and formats.
+// could have some kind of non-node server operating on client-side apps.
+
+// jsgui3-coming-soon could itself be a website.
+//  or a webpage?
+
+// website with a single page.
+
+
+
+
+
+
+
+
+
+
 const Webpage = require('./webpage');
 // Website is a Publisher?