statebus 7.0.1 → 7.0.4

package/clients.js

@@ -43,19 +43,21 @@
         // return new SockJS(url + '/' + websocket_prefix)
     }
     function client_creds (server_url) {
+        // This function is only used for websocket connections.
+        // http connections set the cookie on the server.
         var me = bus.get('ls/me')
         bus.log('connect: me is', me)
         if (!me.client) {
             // Create a client id if we have none yet.
             // Either from a cookie set by server, or a new one from scratch.
-            var c = get_cookie('client')
+            var c = get_cookie('peer')
             me.client = c || (Math.random().toString(36).substring(2)
                               + Math.random().toString(36).substring(2)
                               + Math.random().toString(36).substring(2))
             bus.set(me)
         }
 
-        set_cookie('client', me.client)
+        set_cookie('peer', me.client)
         return {clientid: me.client}
     }
 
@@ -66,14 +68,18 @@
         var subscriptions = {}
         var put_counter = 0
 
-        function add_prefix (key) {
-            return is_absolute.test(key) ? key : preprefix + key }
-        function rem_prefix (key) {
-            return has_prefix.test(key) ? key.substr(preprefix.length) : key }
+        function add_prefix (url) {
+            return is_absolute.test(url) ? url : preprefix + url }
+        function rem_prefix (url) {
+            return has_prefix.test(url) ? url.substr(preprefix.length) : url }
         function add_prefixes (obj) {
-            return bus.translate_keys(bus.clone(obj), add_prefix) }
+            var keyed = bus.translate_keys(bus.clone(obj), add_prefix)
+            return bus.translate_links(bus.clone(keyed), add_prefix)
+        }
         function rem_prefixes (obj) {
-            return bus.translate_keys(bus.clone(obj), rem_prefix) }
+            var keyed = bus.translate_keys(bus.clone(obj), rem_prefix)
+            return bus.translate_links(bus.clone(keyed), rem_prefix)
+        }
 
         var puts = new Map()
         function enqueue_put (url, body) {
@@ -112,11 +118,12 @@
             setTimeout(function () {send_put(id)}, 1000)
         }
         function send_all_puts () {
-            for (var id of puts.keys())
-                if (puts.get(id).status === 'waiting') {
+            puts.forEach(function (value, id) {
+                if (value.status === 'waiting') {
                     console.log('Sending waiting put', id)
                     send_put(id)
                 }
+            })
         }
 
         bus(prefix).to_set   = function (obj, t) {
@@ -218,6 +225,25 @@
         }
     }
 
+    function http_automount () {
+        function get_domain (key) { // Returns e.g. "state://foo.com"
+            var m = key.match(/^https?\:\/\/(([^:\/?#]*)(?:\:([0-9]+))?)/)
+            return m && m[0]
+        }
+
+        var old_route = bus.route
+        var connections = {}
+        bus.route = function (key, method, arg, t) {
+            var d = get_domain(key)
+            if (d && !connections[d]) {
+                http_mount(d + '/*', d + '/')
+                connections[d] = true
+            }
+
+            return old_route(key, method, arg, t)
+        }
+    }
+
 
     // ****************
     // Manipulate Localstorage
@@ -476,30 +502,8 @@
         }
     }
 
-    function load_scripts() {
-        // console.info('Loading scripts! if', !!!window.statebus)
-        if (!window.statebus) {
-            var statebus_dir = clientjs_option('src')
-            if (statebus_dir) statebus_dir = statebus_dir.match(/(.*)[\/\\]/)
-            if (statebus_dir) statebus_dir = statebus_dir[1] + '/'
-            else statebus_dir = ''
-
-            // var js_urls = {
-            //     react: statebus_dir + 'extras/react.js',
-            //     sockjs: statebus_dir + 'extras/sockjs.js',
-            //     coffee: statebus_dir + 'extras/coffee.js',
-            //     statebus: statebus_dir + 'statebus.js'
-            // }
-            // if (statebus_dir == 'https://stateb.us/')
-            //     js_urls.statebus = statebus_dir + 'statebus4.js'
-
-            // for (var name in js_urls)
-            //     document.write('<script src="' + js_urls[name] + '" charset="utf-8"></script>')
-
-            document.addEventListener('DOMContentLoaded', scripts_ready, false)
-        }
-        else
-            scripts_ready()
+    function load_scripts () {
+        scripts_ready()
     }
 
     function clientjs_option (option_name) {
@@ -519,11 +523,8 @@
         window.bus = window.statebus()
         bus.label = 'bus'
 
-        statebus.create_react_class = create_react_class
-        statebus.createReactClass = create_react_class
-
         // improve_react()
-        statebus.ignore_flashbacks = false
+        // statebus.ignore_flashbacks = false
         bus.libs = {}
         bus.libs.http_out = http_mount
         bus.libs.react_class = create_react_class
@@ -539,26 +540,14 @@
         //     }
         // }
 
-        bus.net_automount()
-
-        // This /new/* code is deprecated
-        if (!clientjs_option('braid_mode')) {
-            bus('/new/*').to_set = function (o) {
-                if (o.key.split('/').length > 3) return
-
-                var old_key = o.key
-                o.key = old_key + '/' + Math.random().toString(36).substring(2,12)
-                statebus.cache[o.key] = o
-                delete statebus.cache[old_key]
-                bus.set(o)
-            }
-        }
+        // bus.net_automount()
+        http_automount()
 
         load_coffee()
 
         statebus.compile_coffee = compile_coffee
         statebus.load_client_code = load_client_code
-        statebus.load_widgets = load_widgets
+        // statebus.load_widgets = load_widgets
 
         if (clientjs_option('globals')) {
             // Setup globals
@@ -577,7 +566,7 @@
                     statebus_ready[i]()
         }, false)
 
-        document.addEventListener('DOMContentLoaded', load_widgets, false)
+        // document.addEventListener('DOMContentLoaded', load_widgets, false)
         
         // if (dom.Body || dom.body || dom.BODY)
         //     react_render((window.Body || window.body || window.BODY)(), document.body)
@@ -753,7 +742,7 @@
     function make_component(name, func) {
         // Define the component
 
-        window[name] = users_widgets[name] = statebus.create_react_class({
+        window[name] = users_widgets[name] = statebus.libs.react_class({
             displayName: name,
             render: function () {
                 var args = []
@@ -803,103 +792,6 @@
         })
     }
 
-    function make_syncarea () {
-        // a textarea that syncs with other textareas via diffsync
-        // options:
-        //     textarea_style : hashmap of styles to add to the textarea
-        //     cursor_style : hashmap of styles to add to each peer's cursor
-        //     autosize : true --> resizes the textarea vertically to fit the text inside it
-        //     ws_url : websocket url for the diffsync server,
-        //              e.g. 'wss://invisible.college:' + diffsync.port
-        //     channel : 'diffsync_channel' --> diffsync channel to connect to
-        window['SYNCAREA'] = users_widgets['SYNCAREA'] = React.createClass({
-            getInitialState : function () {
-                return { cursor_positions : {} }
-            },
-            on_text_changed : function () {
-                if (this.props.autosize) {
-                    var t = this.textarea_ref
-                    t.style.height = null
-                    while (t.rows > 1 && t.scrollHeight < t.offsetHeight) t.rows--
-                    while (t.scrollHeight > t.offsetHeight) t.rows++
-                }
-            },
-            componentDidMount : function () {
-                var self = this
-                self.on_ranges = function (ranges) {
-                    self.ranges = ranges
-                    var cursor_positions = {}
-                    Object.keys(ranges).forEach(function (k) {
-                        var r = ranges[k]
-                        var xy = getCaretCoordinates(self.textarea_ref, r[0])
-                        var x = self.textarea_ref.offsetLeft - self.textarea_ref.scrollLeft + xy.left + 'px'
-                        var y = self.textarea_ref.offsetTop - self.textarea_ref.scrollTop + xy.top + 'px'
-                        cursor_positions[k] = [x, y]
-                    })
-                    self.setState({ cursor_positions : cursor_positions })
-                }
-
-                this.ds = diffsync.create_client({
-                    ws_url : this.props.ws_url,
-                    channel : this.props.channel,
-                    get_text : function () {
-                        return self.textarea_ref.value
-                    },
-                    get_range : function () {
-                        var t = self.textarea_ref
-                        return [t.selectionStart, t.selectionEnd]
-                    },
-                    on_text : function (s, range) {
-                        self.textarea_ref.value = s
-                        self.textarea_ref.setSelectionRange(range[0], range[1])
-                        self.on_text_changed()
-                    },
-                    on_ranges : this.on_ranges
-                })
-            },
-            render : function () {
-                var self = this
-                var cursors = []
-                Object.keys(this.state.cursor_positions).forEach(function (k) {
-                    var p = self.state.cursor_positions[k]
-                    var style = {
-                        position : 'absolute',
-                        left : p[0],
-                        top : p[1]
-                    }
-                    Object.keys(self.props.cursor_style).forEach(function (k) {
-                        style[k] = self.props.cursor_style[k]
-                    })
-                    cursors.push(React.createElement('div', {
-                        key : k,
-                        style : style
-                    }))
-                })
-                return React.createElement('div', {
-                    style : {
-                        clipPath : 'inset(0px 0px 0px 0px)'
-                    },
-                }, React.createElement('textarea', {
-                    ref : function (t) { self.textarea_ref = t },
-                    style : this.props.textarea_style,
-                    onChange : function (e) {
-                        self.ds.on_change()
-                        self.on_text_changed()
-                    },
-                    onMouseDown : function () {
-                        setTimeout(function () { self.ds.on_change() }, 0)
-                    },
-                    onKeyDown : function () {
-                        setTimeout(function () { self.ds.on_change() }, 0)
-                    },
-                    onScroll : function () {
-                        self.on_ranges(self.ranges)
-                    }
-                }), cursors)
-            }
-        })
-    }
-
     function compile_coffee (coffee, filename) {
         var compiled
         try {
@@ -930,10 +822,12 @@
         return compiled
     }
     function load_client_code (code) {
-        var dom = {}, ui = {}
-        if (code) eval(code)
-        else { dom = window.dom; ui = window.ui }
-        for (var k in ui) dom[k] = dom[k] || ui[k]
+        // What is this function for?
+        var dom = {}
+        if (code)
+            eval(code)
+        else
+            dom = window.dom
         for (var widget_name in dom)
             window.dom[widget_name] = dom[widget_name]
     }
@@ -945,6 +839,11 @@
             if (scripts[i].getAttribute('type')
                 in {'statebus':1, 'coffeedom':1,'statebus-js':1,
                     'coffee':1, 'coffeescript':1}) {
+
+                if (!window.CoffeeScript) {
+                    console.error('Cannot load <script type="coffee"> because coffeescript library isn\'t present')
+                    return
+                }
                 // Compile coffeescript to javascript
                 var compiled = scripts[i].text
                 if (scripts[i].getAttribute('type') !== 'statebus-js')
@@ -976,15 +875,15 @@
         return widge(props, children)
     }
 
-    window.users_widgets = users_widgets
-    function load_widgets () {
-        for (var w in users_widgets) {
-            var nodes = document.getElementsByTagName(w)
-            for (var i=0; i<nodes.length; i++)
-                if (!nodes[i].seen)
-                    react_render(dom_to_widget(nodes[i]), nodes[i])
-        }
-    }
+    // window.users_widgets = users_widgets
+    // function load_widgets () {
+    //     for (var w in users_widgets) {
+    //         var nodes = document.getElementsByTagName(w)
+    //         for (var i=0; i<nodes.length; i++)
+    //             if (!nodes[i].seen)
+    //                 react_render(dom_to_widget(nodes[i]), nodes[i])
+    //     }
+    // }
 
     load_scripts()
 })()

package/extras/tests.js

@@ -1122,23 +1122,27 @@ function setup_servers () {
     c.ws_mount('/*', 'statei://localhost:' + port)
 
     s.set({key: 'users',
-            all: [ {  key: 'user/1',
-                      name: 'mike',
-                      email: 'toomim@gmail.com',
-                      admin: true,
-                      pass: '$2a$10$Ti7BgAZS8sB0Z62o2NKsIuCdmU3q9xP7jexVccTcG19Y8qpBpl/1y' }
-
-                   ,{ key: 'user/2',
-                      name: 'j',
-                      email: 'jtoomim@gmail.com',
-                      admin: true,
-                      pass: '$2a$10$Ti7BgAZS8sB0Z62o2NKsIuCdmU3q9xP7jexVccTcG19Y8qpBpl/1y' }
-
-                   ,{ key: 'user/3',
-                      name: 'boo',
-                      email: 'boo@gmail.com',
-                      admin: false,
-                      pass: '$2a$10$4UTjzf5OOGdkrCEsT.hO/.csKqf7u8mZ23ZT6stamBAWNV7u5WJuu' } ] })
+            val: [ {link: 'user/1'},
+                   {link: 'user/2'},
+                   {link: 'user/3'} ] })
+    s.set({ key: 'user/1', val: {
+        name: 'mike',
+        email: 'toomim@gmail.com',
+        admin: true,
+        pass: '$2a$10$Ti7BgAZS8sB0Z62o2NKsIuCdmU3q9xP7jexVccTcG19Y8qpBpl/1y'
+    }})
+    s.set({ key: 'user/2', val: {
+        name: 'j',
+        email: 'jtoomim@gmail.com',
+        admin: true,
+        pass: '$2a$10$Ti7BgAZS8sB0Z62o2NKsIuCdmU3q9xP7jexVccTcG19Y8qpBpl/1y'
+    }})
+    s.set({ key: 'user/3', val: {
+        name: 'boo',
+        email: 'boo@gmail.com',
+        admin: false,
+        pass: '$2a$10$4UTjzf5OOGdkrCEsT.hO/.csKqf7u8mZ23ZT6stamBAWNV7u5WJuu'
+    }})
 
     return {s, c}
 }
@@ -1182,18 +1186,22 @@ test(function login (done) {
     c(function () {
         var u = c.get('/current_user')
         log('Current user changed!', c.label, JSON.stringify(u))
-        if (u.logged_in) {
-            log('Yay! We are logged in as', u.user.name)
-            c.forget()
-            setTimeout(function () {done()}, 200)
+        if (u.val.logged_in) {
+            var user = c.get(u.val.user.link)
+            log('Yay! We are logged in as', u.val.user,
+                'which is loaded as', user)
+            if (user.val) {
+                assert(user.val.name === 'mike')
+                c.forget()
+                setTimeout(function () {done()}, 200)
+            }
         } else
             log("Ok... we aren't logged in yet.  We be patient.")
     })
 
     delay(200, () => {
-        // c.honk = user0.honk = true
         var u = c.get('/current_user')
-        u.login_as = {name: 'mike', pass: 'yeah'}
+        u.val = {login_as: {name: 'mike', pass: 'yeah'}}
         log('Logging in')
         //s.honk = true
         c.set(u)
@@ -1207,10 +1215,10 @@ test(function wrong_password (done) {
 
     var u = c.get('/current_user')
     //assert(u.logged_in && u.user.name == 'mike')
-    u.login_as = {name: 'j', pass: 'nah'}
+    u.val = {login_as: {name: 'j', pass: 'nah'}}
     c.set(u)
     delay(500, () => {
-        assert(!u.login_as, 'Aborted login needs to abort')
+        assert(!u.val.login_as, 'Aborted login needs to abort')
         log('Good, the login failed.')
         done()
     })
@@ -1225,54 +1233,50 @@ test(function create_account (done) {
     delay(500, () => {
         log('Logging in')
         cu = c.get('/current_user')
-        cu.login_as = {name: 'mike', pass: 'yeah'}
+        cu.val = {login_as: {name: 'mike', pass: 'yeah'}}
         c.set(cu)
     })
 
     // Log out
     delay(500, () => {
-        assert(c.get('/current_user').logged_in)
+        assert(c.get('/current_user').val.logged_in)
         log('Logging out')
-        cu.logout = true; c.set(cu)
+        cu.val.logout = true; c.set(cu)
     })
 
     // Create bob and log in as bob
     delay(400, () => {
         log('Creating bob')
-        assert(!cu.logged_in, '3 logged in')
-        cu.create_account = {name: 'bob', email: 'b@o.b', pass: 'boob'}
+        assert(!cu.val.logged_in, '3 logged in')
+        cu.val.create_account = {name: 'bob', email: 'b@o.b', pass: 'boob'}
         c.set(cu)
 
         log('Logging in as bob')
-        delete cu.create_account
-        cu.login_as = {name: 'bob', pass: 'boob'}
+        delete cu.val.create_account
+        cu.val.login_as = {name: 'bob', pass: 'boob'}
         c.set(cu)
     })
 
     // Log out
     delay(600, () => {
-        assert(cu.logged_in)
-        assert(cu.user.name === 'bob'
-               && cu.user.email === 'b@o.b'
-               && cu.user.pass === undefined
-               && cu.user.key.match(/\/user\/.*/),
-               'Bad user', cu)
+        assert(cu.val.logged_in)
+        assert(cu.val.user.link === '/user/bob')
 
         log('Now let\'s log out!')
-        cu.logout = true; c.set(cu)
+        cu.val.logout = true; c.set(cu)
     })
 
     // Log back in as boob
     delay(600, () => {
         log('Logging back in as boob')
-        assert(!cu.logged_in, 'Still logged in, as ' + cu.key)
-        cu.login_as = {name: 'bob', pass:'boob'}
+        assert(!cu.val.logged_in, 'Still logged in, as ' + cu.key)
+        cu.val.login_as = {name: 'bob', pass:'boob'}
         c.set(cu)
     })
     
     delay(600, () => {
-        assert(cu.logged_in)
-        assert(cu.user.name === 'bob')
+        assert(cu.val.logged_in)
+        assert(cu.val.user.link === '/user/bob')
         done()
     })
 })
@@ -1607,8 +1611,8 @@ if (false) {
 
         // Make stuff as user A
         var cu = c.get('/current_user')
-        c.set({key: '/current_user', create_account: {name: 'a', pass: 'a'}})
-        c.set({key: '/current_user', login_as: {name: 'a', pass: 'a'}})
+        c.set({key: '/current_user', val: {create_account: {name: 'a', pass: 'a'}}})
+        c.set({key: '/current_user', val: {login_as: {name: 'a', pass: 'a'}}})
         var a_closet = c.get('/user/a/foo')
         var a_private = c.get('/user/a/private/foo')
 
@@ -1620,14 +1624,14 @@ if (false) {
         // User A can see it
         delay(450, ()=> {
             log('1. Now curr user is', cu)
-            assert(cu.logged_in == true, 'not logged in')
+            assert(cu.val.logged_in == true, 'not logged in')
             log('closet is', a_closet)
             assert(a_closet._ === 3, 'closet not right')
             assert(a_private._ === 4, 'private not right')
 
             // Set up User B
-            c.set({key: '/current_user', create_account: {name: 'b', pass: 'b'}})
-            c.set({key: '/current_user', login_as: {name: 'b', pass: 'b'}})
+            c.set({key: '/current_user', val: {create_account: {name: 'b', pass: 'b'}}})
+            c.set({key: '/current_user', val: {login_as: {name: 'b', pass: 'b'}}})
         })
 
         // User B can't see private stuff

package/package.json

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