statebus 6.1.16 → 6.1.20

package/client.js

@@ -1,5 +1,6 @@
 (function () {
-    var unique_sockjs_string = '_connect_to_statebus_'
+    var websocket_prefix = (clientjs_option('websocket_path')
+                            || '_connect_to_statebus_')
 
     window.dom = window.dom || new Proxy({}, {
         get: function (o, k) { return o[k] },
@@ -37,8 +38,8 @@
         //     url = link.href
         // }
         console.log('opening websocket to', url)
-        return new WebSocket(url + '/' + unique_sockjs_string + '/websocket')
-        // return new SockJS(url + '/' + unique_sockjs_string)
+        return new WebSocket(url + '/' + websocket_prefix + '/websocket')
+        // return new SockJS(url + '/' + websocket_prefix)
     }
     function client_creds (server_url) {
         var me = bus.fetch('ls/me')
@@ -62,7 +63,7 @@
         var has_prefix = new RegExp('^' + preprefix)
         var is_absolute = /^https?:\/\//
         var client_fetched_keys = new bus.Set()
-        if (url[url.length-1]=='/') url = url.substr(0,url.length-1)
+        //if (url[url.length-1]=='/') url = url.substr(0,url.length-1)
         function add_prefix (key) {
             return is_absolute.test(key) ? key : preprefix + key }
         function rem_prefix (key) {
@@ -73,7 +74,6 @@
             return bus.translate_keys(bus.clone(obj), rem_prefix) }
 
         bus(prefix).to_save   = function (obj, t) {
-            console.log('saving', prefix, obj)
             bus.save.fire(obj)
 
             // var x = {save: obj}
@@ -82,9 +82,10 @@
             // if (t.patch)   x.patch   = t.patch
             // if (t.patch)   x.save    = rem_prefix(x.save.key)
 
-            braid_fetch(url + obj.key,
+            braid_fetch(url + rem_prefix(obj.key),
                         {
                             method: 'put',
+                            'content-type': 'application/json',
                             body: JSON.stringify(obj.val)
                         })
         }
@@ -94,11 +95,12 @@
                 braid_fetch(url + rem_prefix(key),
                             {
                                 method: 'get',
-                                subscribe: true
+                                subscribe: true,
+                                headers: {accept: 'application/json'}
                             }
-                           ).andThen( x => {
+                           ).andThen( function (x) {
                                t.return({
-                                   key,
+                                   key: key,
                                    val: add_prefixes(JSON.parse(x.body))
                                })
                            })
@@ -439,7 +441,7 @@
         make_client_statebus_maker()
         window.bus = window.statebus()
         bus.label = 'bus'
-        if (clientjs_option('braid_mode_test'))
+        if (clientjs_option('braid_mode'))
             bus.state = bus.braid_proxy()
         else
             window.sb = bus.sb
@@ -450,9 +452,13 @@
         improve_react()
         window.ignore_flashbacks = false
         if (statebus_server !== 'none') {
-            bus.net_mount ('/*', statebus_server)
-            if (clientjs_option('braid_mode_test'))
-                braid_http_mount ('http/*', statebus_server)
+            if (clientjs_option('braid_mode')) {
+                console.log('We socket-free!')
+                braid_http_mount ('/*', statebus_server)
+            } else {
+                bus.net_mount ('/*', statebus_server)
+                console.log('We going websocket!')
+            }
         }
 
         if (window.statebus_backdoor) {
@@ -462,7 +468,7 @@
         bus.net_automount()
 
         // This /new/* code is deprecated
-        if (!clientjs_option('braid_mode_test')) {
+        if (!clientjs_option('braid_mode')) {
             bus('/new/*').to_save = function (o) {
                 if (o.key.split('/').length > 3) return
 

package/extras/tests.js

@@ -872,7 +872,7 @@ test(function proxies2 (done) {
 })
 
 test(function braid_proxies (done) {
-    var bus = require('../statebus').serve({braid_mode_test: true,
+    var bus = require('../statebus').serve({braid_mode: true,
                                             file_store: false})
     var state = bus.state
 
@@ -896,8 +896,8 @@ test(function braid_proxies (done) {
     log('array:', state.array)
     log('bar:', state.bar)
     assert(state.bar.a[1] !== 2,
-           "Array ref linked.\n\t"
-           + JSON.stringify(bus.cache.bar) + '\n\t'
+           "Array ref linked.\n\tbar:   "
+           + JSON.stringify(bus.cache.bar) + '\n\tarray: '
            + JSON.stringify(bus.cache.array))
 
     state.undefining = undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statebus",
-  "version": "6.1.16",
+  "version": "6.1.20",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {

package/server.js

@@ -1,6 +1,5 @@
 var fs = require('fs'),
     util = require('util')
-var unique_sockjs_string = '_connect_to_statebus_'
 
 // Import braidify if it's available
 try {
@@ -22,6 +21,7 @@ function default_options (bus) { return {
             certificate: 'certs/certificate',
             certificate_bundle: 'certs/certificate-bundle'},
     connections: {include_users: true, edit_others: true},
+    websocket_path: '_connect_to_statebus_',
     __secure: false
 }}
 
@@ -106,9 +106,6 @@ function import_server (bus, options)
                 bus.sync_files(x.state_path, x.fs_path)
         })
 
-        // User will put his routes in here
-        bus.express.use('/', bus.http)
-
         // Free the CORS for Braid requests!
         bus.express.use((req, res, next) => {
             // If this requests knows about Braid then we presume the
@@ -122,6 +119,9 @@ function import_server (bus, options)
                 next()
         })
 
+        // User will put his routes in here
+        bus.express.use(bus.http)
+
         // Connect bus to the HTTP server
         bus.express.use(bus.http_handlers)
 
@@ -175,7 +175,7 @@ function import_server (bus, options)
 
     initialize_braid_http: function () {
         // Set up default linked json converters
-        if (bus.options.braid_mode_test) {
+        if (bus.options.braid_mode) {
             bus.to_http_body = (o) => JSON.stringify(o.val)
             bus.state = bus.braid_proxy()
         } else
@@ -219,16 +219,17 @@ function import_server (bus, options)
             cbus.fetch(key, cb = (o) => {
                 var body = bus.to_http_body(o)
 
-                // Return 404 if the value is undefined
-                if (!body) {
-                    console.log('no body! time to 404')
-                    res.statusCode = 404
-                    res.end()
-                }
+                // // Return 404 if the value is undefined
+                // if (!body) {
+                //     console.log('no body! time to 404')
+                //     res.statusCode = 404
+                //     res.end()
+                // }
 
                 // Or if we're braid, send via subscription
-                else if (braidify)
-                    res.sendVersion({body})
+                // else
+                if (braidify)
+                    res.sendVersion({body: body || 'null'})
 
                 // Or just return the current version
                 else
@@ -385,7 +386,8 @@ function import_server (bus, options)
         this.http_server.on('request',  // Install express
                             function (request, response) {
                                 // But express should ignore all sockjs requests
-                                if (!request.url.startsWith('/'+unique_sockjs_string+'/'))
+                                if (!request.url.startsWith(
+                                    '/' + bus.options.websocket_path + '/'))
                                     express_app(request, response)
                             })
 
@@ -585,7 +587,7 @@ function import_server (bus, options)
             }
         })
 
-        s.installHandlers(httpserver, {prefix:'/' + unique_sockjs_string})
+        s.installHandlers(httpserver, {prefix:'/' + bus.options.websocket_path})
     },
 
     make_websocket: function make_websocket (url) {
@@ -593,7 +595,7 @@ function import_server (bus, options)
         url = url.replace(/^istate:\/\//, 'ws://')
         url = url.replace(/^statei:\/\//, 'ws://')
         WebSocket = require('websocket').w3cwebsocket
-        return new WebSocket(url+'/'+unique_sockjs_string+'/websocket')
+        return new WebSocket(url+'/'+bus.options.websocket_path+'/websocket')
     },
     client_creds: function client_creds (server_url) {
         // Right now the server just creates a different random id each time
@@ -2387,11 +2389,14 @@ function import_server (bus, options)
     serve_clientjs: function serve_clientjs (path) {
         path = path || 'client.js'
         bus.http.get('/' + path, (req, res) => {
-            res.send(
+            var files =
                 ['extras/coffee.js', 'extras/sockjs.js', 'extras/react.js',
-                 'statebus.js', 'client.js']
-                    .map((f) => fs.readFileSync('node_modules/statebus/' + f))
-                    .join(';\n'))
+                 'statebus.js', 'client.js'].map((f) => fs.readFileSync('node_modules/statebus/' + f))
+            if (bus.options.braid_mode)
+                files.unshift(fs.readFileSync(
+                    'node_modules/braidify/braidify-client.js'
+                ))
+            res.send(files.join(';\n'))
         })
     },
 

package/statebus.js

@@ -1552,6 +1552,8 @@
                     else if (x[symbols.is_braid_proxy])
                         return ['span', {style: 'background-color: #fffbe5; padding: 3px;'},
                                 JSON.stringify(x)]
+                                // For function proxies:
+                                // JSON.stringify(x(), null, 2)]
                 },
                 hasBody: function (x) {return false}
             }]
@@ -1585,6 +1587,15 @@
                 return item_proxy(new_base, new_base.val)
             }
 
+
+            // For function proxies:
+            //
+            // // Javascript won't let us function call a proxy unless the
+            // // "target" is a function.  So we make a dummy target, and
+            // // don't use it.
+            // var dummy = function () {}
+
+
             return new Proxy(o, {
                 get: function get(o, k) {
                     if (k === 'inspect' || k === 'valueOf')
@@ -1606,20 +1617,24 @@
                 },
                 deleteProperty: function del (o, k) {
                     delete o[proxied_2_keyed(k)]
-                },
-                apply: function apply (o, This, args) {
-                    return o
                 }
+                // For function proxies:
+                //
+                // apply: function apply (o, This, args) {
+                //     return translate_fields(o, keyed_2_proxied)
+                // }
             })}
 
 
+        // For function proxies:
+        // var dummy = function () {}
+
         // The top-level Proxy object holds HTTP resources
         return new Proxy(cache, {
             get: function get(o, k) {
                 if (k === 'inspect' || k === 'valueOf' || typeof k === 'symbol')
                     return undefined
-                if (k in bogus_keys)
-                    return o[k]
+                bogus_check(k)
                 var base = bus.fetch(k)
                 return item_proxy(base, base.val)
             },
@@ -1630,7 +1645,11 @@
             },
             deleteProperty: function del (o, k) {
                 bus.delete(proxied_2_keyed(k))
-            }
+            },
+            // For function proxies:
+            // apply: function apply (o, This, args) {
+            //     return 'fluffy'
+            // }
         })
     }
 
@@ -1640,8 +1659,8 @@
         return result
     }
 
-    if ((nodejs && bus.options && bus.options.braid_mode_test)
-        || (!nodejs && window.Proxy && clientjs_option('braid_mode_test')))
+    if ((nodejs && bus.options && bus.options.braid_mode)
+        || (!nodejs && window.Proxy && clientjs_option('braid_mode')))
         state = braid_proxy()