statebus 6.1.13 → 6.1.17

package/client.js

@@ -62,7 +62,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 +73,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 +81,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,7 +94,8 @@
                 braid_fetch(url + rem_prefix(key),
                             {
                                 method: 'get',
-                                subscribe: true
+                                subscribe: true,
+                                headers: {accept: 'application/json'}
                             }
                            ).andThen( x => {
                                t.return({
@@ -439,7 +440,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 +451,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 +467,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.13",
+  "version": "6.1.17",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {

package/server.js

@@ -2,6 +2,15 @@ var fs = require('fs'),
     util = require('util')
 var unique_sockjs_string = '_connect_to_statebus_'
 
+// Import braidify if it's available
+try {
+    var braidify = require('braidify').http_server
+    console.log('Found braidify library. Braid-HTTP enabled!')
+} catch (e) {
+    var braidify = undefined
+}
+
+
 function default_options (bus) { return {
     port: 'auto',
     backdoor: null,
@@ -68,6 +77,7 @@ function import_server (bus, options)
         bus.express = express()
         bus.http = express.Router()
         bus.install_express(bus.express)
+        bus.initialize_braid_http()
 
         // use gzip compression if available
         try { bus.http.use(require('compression')())
@@ -96,19 +106,102 @@ function import_server (bus, options)
                 bus.sync_files(x.state_path, x.fs_path)
         })
 
+        bus.express.use((req, res, next) => {
+            console.log('server.js:', req.method, req.url)
+            next()
+        })
+
+        // Free the CORS for Braid requests!
+        bus.express.use((req, res, next) => {
+            // If this requests knows about Braid then we presume the
+            // programmer knows that any client might make this cross-origin
+            // request.
+            if (req.version || req.parents || req.subscribe
+                || req.headers.subscribe
+                || req.method === 'OPTIONS')
+                free_the_cors(req, res, next)
+            else
+                next()
+        })
+
         // User will put his routes in here
-        bus.express.use('/', bus.http)
+        bus.express.use(bus.http)
 
-        // Use braidify if it's available
-        try {
-            var braidify = require('braidify').http_server
-            console.log('Found braidify library. Braid-HTTP enabled!')
-        } catch (e) {
-            var braidify = undefined
+        // Connect bus to the HTTP server
+        bus.express.use(bus.http_handlers)
+
+        // Serve Client Coffee
+        bus.serve_client_coffee()
+
+        // Custom router
+        bus.route = function server_route (key, method, arg, t) {
+            var handlers = bus.bindings(key, method)
+            var count = handlers.length
+            if (count)
+                bus.log('route:', bus+'("'+key+'").'+method+'['+handlers.length+'](key:"'+(arg.key||arg)+'")')
+
+            // Call all handlers!
+            for (var i=0; i<handlers.length; i++)
+                bus.run_handler(handlers[i].func, method, arg, {t: t, binding: handlers[i].key})
+
+            // Now handle backup handlers
+            if (count === 0) {
+
+                // A save to master without a to_save defined should be
+                // automatically reflected to all clients.
+                if (method === 'to_save') {
+                    bus.save.fire(arg, t)
+                    bus.route(arg.key, 'on_set_sync', arg, t)
+                    count++
+                }
+
+                // A fetch to master without a to_fetch defined should go to
+                // the database, if we have one.
+                if (method === 'to_fetch') {
+                    bus.db_fetch(key)
+                    // This basically renders the count useless-- you probably
+                    // don't want to wrap this route() with another route().
+                    count++
+                }
+            }
+            return handlers.length
+        }
+
+        // Back door to the control room
+        if (bus.options.backdoor) {
+            bus.make_http_server({
+                port: bus.options.backdoor,
+                name: 'backdoor_http_server',
+                use_ssl: use_ssl
+            })
+            bus.sockjs_server(this.backdoor_http_server)
         }
+    },
+
+    initialize_braid_http: function () {
+        // Set up default linked json converters
+        if (bus.options.braid_mode) {
+            bus.to_http_body = (o) => JSON.stringify(o.val)
+            bus.state = bus.braid_proxy()
+        } else
+            bus.to_http_body = (o) => {
+                var unwrap = (Object.keys(o).length === 2
+                              && '_' in o
+                              && typeof o._ === 'string')
+                // To do: translate pointers as keys
+                return unwrap ? o._ : JSON.stringify(o)
+            }
+
+        bus.from_http_body = (key, body) => ({
+            key,
+            val: JSON.parse(body)
+        })
+    },
+
+    // Connect HTTP GET and PUT to our Fetch and Save
+    http_handlers: function (req, res, next) {
+        if (req.method === 'GET') {
 
-        // Mirror state over HTTP
-        bus.express.get('*', function (req, res) {
             // Make a temporary client bus
             var cbus = bus.bus_for_http_client(req, res)
             var cb
@@ -131,28 +224,29 @@ 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
                     res.send(body)
 
-                // And shut down the connection if there's nothing left to do
+                // And shut down the connection if nothing's left to do
                 if (!braidify || !req.subscribe || !body)
                     end_it_all()
             })
-        })
+        }
 
-        bus.express.put('*', function (req, res) {
+        else if (req.method === 'PUT') {
             console.log('Got a put with body', req.body)
 
             // Make a temporary client bus
@@ -190,72 +284,9 @@ function import_server (bus, options)
                     res.end()
                 })
             }
-        })
-
-        // Set up default linked json converters
-        if (bus.options.braid_mode_test) {
-            bus.to_http_body = (o) => JSON.stringify(o.val)
-            bus.state = bus.braid_proxy()
-        } else
-            bus.to_http_body = (o) => {
-                var unwrap = (Object.keys(o).length === 2
-                              && '_' in o
-                              && typeof o._ === 'string')
-                // To do: translate pointers as keys
-                return unwrap ? o._ : JSON.stringify(o)
-            }
-
-        bus.from_http_body = (key, body) => ({
-            key,
-            val: JSON.parse(body)
-        })
-
-        // Serve Client Coffee
-        bus.serve_client_coffee()
-
-        // Custom router
-        bus.route = function server_route (key, method, arg, t) {
-            var handlers = bus.bindings(key, method)
-            var count = handlers.length
-            if (count)
-                bus.log('route:', bus+'("'+key+'").'+method+'['+handlers.length+'](key:"'+(arg.key||arg)+'")')
-
-            // Call all handlers!
-            for (var i=0; i<handlers.length; i++)
-                bus.run_handler(handlers[i].func, method, arg, {t: t, binding: handlers[i].key})
-
-            // Now handle backup handlers
-            if (count === 0) {
-
-                // A save to master without a to_save defined should be
-                // automatically reflected to all clients.
-                if (method === 'to_save') {
-                    bus.save.fire(arg, t)
-                    bus.route(arg.key, 'on_set_sync', arg, t)
-                    count++
-                }
-
-                // A fetch to master without a to_fetch defined should go to
-                // the database, if we have one.
-                if (method === 'to_fetch') {
-                    bus.db_fetch(key)
-                    // This basically renders the count useless-- you probably
-                    // don't want to wrap this route() with another route().
-                    count++
-                }
-            }
-            return handlers.length
-        }
-
-        // Back door to the control room
-        if (bus.options.backdoor) {
-            bus.make_http_server({
-                port: bus.options.backdoor,
-                name: 'backdoor_http_server',
-                use_ssl: use_ssl
-            })
-            bus.sockjs_server(this.backdoor_http_server)
         }
+        else
+            next()
     },
 
     bus_for_http_client: function (req, res) {
@@ -2362,11 +2393,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'))
         })
     },
 
@@ -2450,6 +2484,24 @@ function import_server (bus, options)
 }
 
 
+// Disables CORS in HTTP servers
+function free_the_cors (req, res, next) {
+    console.log('free the cors!', req.method, req.url)
+
+    var free_the_cors = {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
+        "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, patches, cache-control"
+    }
+    Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]))
+    if (req.method === 'OPTIONS') {
+        res.writeHead(200)
+        res.end()
+    } else
+        next()
+}
+
+
 // Handy functions for writing tests on nodejs
 var tests = []
 function test (f) {tests.push(f)}

package/statebus.js

@@ -1546,9 +1546,14 @@
         if (!nodejs)
             window.devtoolsFormatters = [{
                 header: function (x) {
-                    return x[symbols.is_proxy] &&
-                        ['span', {style: 'background-color: #feb; padding: 3px;'},
-                         JSON.stringify(proxy_decode_json(x()))]
+                    if (x[symbols.is_proxy])
+                        return ['span', {style: 'background-color: #feb; padding: 3px;'},
+                                JSON.stringify(proxy_decode_json(x()))]
+                    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}
             }]
@@ -1557,10 +1562,12 @@
     // ******************
     // Braid Test Mode Proxy
 
-    var symbols = {is_proxy: Symbol('is_proxy'),
+    var symbols = {is_braid_proxy: Symbol('is_braid_proxy'),
+                   is_proxy: Symbol('is_proxy'),
                    is_link: Symbol('is_link'),
                    get_json: Symbol('get_json'),
-                   get_base: Symbol('get_base')}
+                   get_base: Symbol('get_base')
+                  }
     function braid_proxy () {
         function item_proxy (base, o) {
 
@@ -1580,10 +1587,22 @@
                 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' || typeof k === 'symbol')
+                    if (k === 'inspect' || k === 'valueOf')
+                        return undefined
+                    if (k === symbols.is_braid_proxy)
+                        return true
+                    if (typeof k === 'symbol')
                         return undefined
                     return item_proxy(base, o[proxied_2_keyed(k)])
                 },
@@ -1591,36 +1610,46 @@
                     var value = translate_fields(v, proxied_2_keyed)
                     o[proxied_2_keyed(k)] = value
                     bus.save(base)
-                    return value
+                    return true
                 },
                 has: function has(o, k) {
                     return o.hasOwnProperty(proxied_2_keyed(k))
                 },
                 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)
             },
             set: function set(o, key, val) {
-                bus.save({key: key, val: val})
+                bus.save({key: key,
+                          val: translate_fields(val, proxied_2_keyed)})
+                return true
             },
             deleteProperty: function del (o, k) {
                 bus.delete(proxied_2_keyed(k))
-            }
+            },
+            // For function proxies:
+            // apply: function apply (o, This, args) {
+            //     return 'fluffy'
+            // }
         })
     }
 
@@ -1630,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()
 
 
@@ -2371,7 +2400,7 @@
                'escape_keys unescape_keys translate_keys apply_patch',
                'keyed_2_proxied proxied_2_keyed translate_fields',
                'net_mount net_automount message_method',
-               'parse Set One_To_Many clone extend deep_map deep_equals prune validate sorta_diff log deps'
+               'parse Set One_To_Many clone extend deep_map deep_equals prune validate sorta_diff log deps symbols'
               ].join(' ').split(' ')
     for (var i=0; i<api.length; i++)
         bus[api[i]] = eval(api[i])