jsgui3-server 0.0.86 → 0.0.89

package/bundler/js-bundler.js

@@ -80,6 +80,8 @@ const bundle_js = (js_file_path, options = {}, callback) => {
             // are there any replacements to do?
             // options.replacements
 
+            
+
             if (options.js_mode === 'debug') {
                 options.include_sourcemaps = true;
             }

package/bundler/webpage-bundler.js

@@ -167,6 +167,8 @@ 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.
+
+                        // js_mode debug
     
                         res_bundle_js = await bundle_js(diskpath_js_client, {
                             'js_mode': 'mini',
@@ -317,10 +319,12 @@ const bundle_web_page = (webpage, options = {}) => {
 
                             //const diskpath_js_client = require.resolve('./../controls/page/admin.js');
 
+                            // debug mode
+
 
                             const obs_bundle = bundle_js(diskpath_js_client, {
-                                'js_mode': 'mini',
-                                'babel': 'mini'
+                                'js_mode': 'debug',
+                                'babel': 'debug'
                             });
 
 

package/examples/square_box.js

@@ -1,5 +1,6 @@
+const jsgui = require('./square_box_client');
 
-const {Demo_UI, Square_Box} = require('./square_box_client');
+const {Demo_UI, Square_Box} = jsgui.controls;
 const Server = require('../server');
 
 // Want to exclude this from the client bundle.

package/examples/square_box_client.js

@@ -85,9 +85,29 @@ Square_Box.css = `
     height: 220px;
 }
 `;
+
+// then if running on the client...?
+
+
+
 //controls.Square_Box = Square_Box;
+// could export jsgui with the updated controls....
+//  so that they are in the correct Page Context.?
+
+
+controls.Demo_UI = Demo_UI;
+controls.Square_Box = Square_Box;
 
+module.exports = jsgui;
+
+/*
 module.exports = {
     Square_Box: Square_Box,
     Demo_UI: Demo_UI
-}
+}
+*/
+
+// Then if window...?
+
+// Need to add the Square_Box control to the context or original map of controls...
+

package/old/square_box.js

@@ -47,6 +47,8 @@ Demo_UI.css = `
 }
 `;
 
+
+
 class Square_Box extends Control {
     constructor(spec) {
         spec.__type_name = spec.__type_name || 'square_box';
@@ -82,6 +84,8 @@ Square_Box.css = `
 `;
 controls.Square_Box = Square_Box;
 
+// need records in the map of controls by name
+
 if (require.main === module) {
     const SCS = require('../../single-control-server');
     const server = new SCS({

package/package.json

@@ -11,13 +11,13 @@
     "browserify": "17.0.0",
     "child-process": "^1.0.2",
     "cookies": "^0.8.0",
-    "fnl": "^0.0.21",
-    "fnlfs": "^0.0.24",
-    "jsgui3-client": "^0.0.69",
-    "jsgui3-html": "0.0.96",
+    "fnl": "^0.0.22",
+    "fnlfs": "^0.0.25",
+    "jsgui3-client": "^0.0.71",
+    "jsgui3-html": "0.0.98",
     "multiparty": "^4.2.3",
     "ncp": "^2.0.0",
-    "obext": "0.0.23",
+    "obext": "0.0.24",
     "rimraf": "^3.0.2",
     "stream-to-array": "^2.3.0",
     "url-parse": "^1.5.10"
@@ -40,5 +40,5 @@
     "type": "git",
     "url": "https://github.com/metabench/jsgui3-server.git"
   },
-  "version": "0.0.86"
+  "version": "0.0.89"
 }

package/resources/local-server-info-resource.js

@@ -31,31 +31,49 @@ class Local_Server_Info extends Resource {
 		//this.meta.set('status', 'off');
 		// could use a _ object with proxies.
 		this.status = 'off';
+
+
+		this.getters = {};
+
+		var getters = {
+			'net': (callback) => {
+				callback(null, os.networkInterfaces());
+			},
+			'cpus': (callback) => {
+				callback(null, os.cpus());
+			}
+		};
+		Object.assign(this.getters, getters);
+
 	}
 	// context needs to work properly in call multiple.. need to sort that out.
 	//  may need to specify the calling object and the function.
 	//  may not just be a pair.
 
 	'start'(callback) {
+
+		// Returning observable / optional callback would be better.
+		//  Switching to observable may be best all round.
+
+
         //var that = this;
+
+		// Super should not be callback start? Seems a little confusing or like it could go wrong here.
+
+
+
 		super.start((err, res_start) => {
 			if (err) {
 				callback(err);
 			} else {
+
+				console.log('\n start callback \n');
+
                 // collections responding to events in their objects?
                 if (this.status === 'off') {
                     //that.meta.set('status', 'starting');
                     this.status = 'starting';
-
-                    var getters = {
-                        'net': (callback) => {
-                            callback(null, os.networkInterfaces());
-                        },
-                        'cpus': (callback) => {
-                            callback(null, os.cpus());
-                        }
-                    };
-                    Object.assign(this.getters, getters);
+					
                     this.status = 'on';
                     this.raise_event('started');
                     if (callback) {

package/server.js

@@ -350,6 +350,8 @@ class JSGUI_Server extends Evented_Class {
                 var sock_router = rp.get_resource('Server Sock Router');
                 */
 
+                // just lsi.get?
+
                 lsi.getters.net((err, net) => {
                     if (err) {
                         callback(err);