statebus 6.1.20 → 6.1.23

package/client.js

@@ -37,7 +37,7 @@
         //     link.href = url
         //     url = link.href
         // }
-        console.log('opening websocket to', url)
+
         return new WebSocket(url + '/' + websocket_prefix + '/websocket')
         // return new SockJS(url + '/' + websocket_prefix)
     }
@@ -62,7 +62,8 @@
         var preprefix = prefix.slice(0,-1)
         var has_prefix = new RegExp('^' + preprefix)
         var is_absolute = /^https?:\/\//
-        var client_fetched_keys = new bus.Set()
+        var subscriptions = {}
+        var put_counter = 0
         //if (url[url.length-1]=='/') url = url.substr(0,url.length-1)
         function add_prefix (key) {
             return is_absolute.test(key) ? key : preprefix + key }
@@ -73,45 +74,149 @@
         function rem_prefixes (obj) {
             return bus.translate_keys(bus.clone(obj), rem_prefix) }
 
+
+        var puts = new Map()
+        function enqueue_put (url, body) {
+            var id = put_counter++
+            puts.set(id, {url: url, body: body, id: id})
+            send_put(id)
+        }
+        function send_put (id) {
+            try {
+                puts.get(id).status = 'sending'
+                braid_fetch(
+                    puts.get(id).url,
+                    {
+                        method: 'put',
+                        headers: {
+                            'content-type': 'application/json',
+                            'put-order': id,
+                        },
+                        body: puts.get(id).body
+                    }
+                ).then(function (res) {
+                    if (res.status !== 200)
+                        console.error('Server gave error on PUT:',
+                                      e, 'for', puts.get(id).body)
+                    else
+                        console.log('Successful put!', puts.get(id).body)
+                    puts.delete(id)
+                }).catch(function (e) {
+                    console.error('Error on PUT, waiting...', puts.get(id).url)
+                    puts.get(id).status = 'waiting'
+                    // console.error('Error on PUT:', e, 'for', puts.get(id).body)
+                    // puts.delete(id)
+                })
+            } catch (e) {
+                console.error('Error on PUT, waiting...', puts.get(id).url)
+                puts.get(id).status = 'waiting'
+            }
+        }
+        function retry_put (id) {
+            setTimeout(function () {send_put(id)}, 1000)
+        }
+        function send_all_puts () {
+            puts.keys().forEach(function (id) {
+                if (puts.get(id).status === 'waiting') {
+                    console.log('Sending waiting put', id)
+                    send_put(id)
+                }
+            })
+        }
+
         bus(prefix).to_save   = function (obj, t) {
             bus.save.fire(obj)
 
+            enqueue_put(url + rem_prefix(obj.key),
+                        JSON.stringify(obj.val))
             // var x = {save: obj}
             // if (t.version) x.version = t.version
             // if (t.parents) x.parents = t.parents
             // if (t.patch)   x.patch   = t.patch
             // if (t.patch)   x.save    = rem_prefix(x.save.key)
-
-            braid_fetch(url + rem_prefix(obj.key),
-                        {
-                            method: 'put',
-                            'content-type': 'application/json',
-                            body: JSON.stringify(obj.val)
-                        })
         }
 
         bus(prefix).to_fetch  = function (key, t) {
-            try {
-                braid_fetch(url + rem_prefix(key),
-                            {
-                                method: 'get',
-                                subscribe: true,
-                                headers: {accept: 'application/json'}
-                            }
-                           ).andThen( function (x) {
-                               t.return({
-                                   key: key,
-                                   val: add_prefixes(JSON.parse(x.body))
-                               })
-                           })
-            } catch (e) {
-                console.error('Braid-HTTP network error:', e)
+            // Subscription can be in states:
+            // - connecting
+            // - connected
+            // - reconnect
+            // - reconnecting
+            // - aborted
+
+            // If we have an outstanding fetch running, then let's tell it to
+            // re-activate!
+            if (subscriptions[key]) {
+                // We should only be here if an existing subscription was
+                // aborted, but hasn't cleared yet.
+                console.assert(subscriptions[key].status === 'aborted',
+                               'Refetching a subscription of status '
+                               + subscriptions[key].status)
+
+                console.trace('foo')
+
+                // Let's tell it to reconnect when it tries to clear!
+                subscriptions[key].status = 'reconnect'
+            }
+
+            // Otherwise, create a new subscription
+            else
+                subscribe (key, t)
+
+            function subscribe (key, t) {
+                var aborter = new AbortController(),
+                    reconnect_attempts = 0
+
+                // Start the subscription!
+                braid_fetch(
+                    // URL
+                    url + rem_prefix(key),
+
+                    // Options
+                    {
+                        method: 'get',
+                        subscribe: true,
+                        headers: {accept: 'application/json'},
+                        signal: aborter.signal
+                    }
+                ).andThen( function (x) {
+                    // New update received!
+                    if (subscriptions[key].status === 'connecting') {
+                        console.log('%c[*] opened ' + key,
+                                    'color: blue')
+                        reconnect_attempts = 0
+                        subscriptions[key].status = 'connected'
+                        send_all_puts()
+                    }
+
+                    // Return the update
+                    t.return({
+                        key: key,
+                        val: add_prefixes(JSON.parse(x.body))
+                    })
+                }).catch( function (e) {
+                    if (subscriptions[key].status === 'aborted') {
+                        // Then this fetch is over and done with!
+                        delete subscriptions[key]
+                        return
+                    }
+
+                    // Reconnect!
+                    setTimeout(function () { subscribe(key, t) },
+                               reconnect_attempts > 0 ? 5000 : 1500)
+                    subscriptions[key].status = 'reconnecting'
+                })
+
+                // Remember this subscription
+                subscriptions[key] = {
+                    aborter: aborter,
+                    status: 'connecting'
+                }
             }
-            client_fetched_keys.add(key)
         }
         bus(prefix).to_forget = function (key) {
-            // send({forget: key}),
-            client_fetched_keys.delete(key)
+            subscriptions[key].status = 'aborted'
+            subscriptions[key].aborter.abort()
         }
     }
 
@@ -453,11 +558,10 @@
         window.ignore_flashbacks = false
         if (statebus_server !== 'none') {
             if (clientjs_option('braid_mode')) {
-                console.log('We socket-free!')
+                console.log('Using Braid-HTTP!')
                 braid_http_mount ('/*', statebus_server)
             } else {
                 bus.net_mount ('/*', statebus_server)
-                console.log('We going websocket!')
             }
         }
 
@@ -587,7 +691,8 @@
                     for (var k in this.props)
                         if (this.props.hasOwnProperty(k))
                             new_props[k] = this.props[k]
-                    if (this.state.value) new_props.value = this.state.value
+                    if (this.state.hasOwnProperty('value'))
+                        new_props.value = this.state.value
                     new_props.onChange = this.onChange
                     return element(new_props)
                 }

package/package.json

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

package/server.js

@@ -219,24 +219,25 @@ 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()
-                // }
-
-                // Or if we're braid, send via subscription
-                // else
+                // If we're braiding, send via subscription
                 if (braidify)
+                    // Note: if body === undefined, we need to send the
+                    // equivalent of a 404.  This is missing in braid spec:
+                    // https://github.com/braid-org/braid-spec/issues/110
                     res.sendVersion({body: body || 'null'})
 
                 // Or just return the current version
-                else
-                    res.send(body)
+                else {
+                    if (body !== undefined)
+                        res.send(body)
+                    else {
+                        res.statusCode = 404
+                        res.end()
+                    }
+                }
 
-                // And shut down the connection if nothing's left to do
-                if (!braidify || !req.subscribe || !body)
+                // And shut down the connection if there's no subscription
+                if (!braidify || !req.subscribe)
                     end_it_all()
             })
         }
@@ -587,6 +588,7 @@ function import_server (bus, options)
             }
         })
 
+        // console.log('websocket listening on', '/' + bus.options.websocket_path)
         s.installHandlers(httpserver, {prefix:'/' + bus.options.websocket_path})
     },
 
@@ -595,7 +597,7 @@ function import_server (bus, options)
         url = url.replace(/^istate:\/\//, 'ws://')
         url = url.replace(/^statei:\/\//, 'ws://')
         WebSocket = require('websocket').w3cwebsocket
-        return new WebSocket(url+'/'+bus.options.websocket_path+'/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

package/statebus.js

@@ -10,10 +10,12 @@
     // Fetch, Save, Forget, Delete
 
     function fetch (key, callback) {
+        if (typeof key !== 'string'
+            && !(typeof key === 'object' && typeof key.key === 'string'))
+            throw ('Error: fetch(key) called with key = '
+                   + JSON.stringify(key))
         key = key.key || key    // You can pass in an object instead of key
                                 // We should probably disable this in future
-        if (typeof key !== 'string')
-            throw ('Error: fetch(key) called with a non-string key: '+key)
         bogus_check(key)
 
         var called_from_reactive_funk = !callback
@@ -2177,13 +2179,13 @@
         if (a_array !== b_array) return ' = ' + JSON.stringify(b)
         if (a_array) {
             if (a.length === b.length-1
-                && !deep_equals(a[a.length], b[b.length])) {
-                return '.push(' +JSON.stringify(b[b.length]) + ')'
+                && deep_equals(a[a.length-1], b[b.length-2])) {
+                return '.push(' +JSON.stringify(b[b.length-1]) + ')'
             }
             for (var i=0; i < a.length; i++) {
                 var tmp = sorta_diff (a[i], b[i])
                 if (tmp)
-                    return '['+i+'] = '+tmp
+                    return '['+i+']'+tmp
             }
             return null
         }