statebus 6.1.22 → 6.1.25

package/client.js

@@ -63,6 +63,7 @@
         var has_prefix = new RegExp('^' + preprefix)
         var is_absolute = /^https?:\/\//
         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,21 +74,66 @@
         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) {
@@ -140,6 +186,7 @@
                                     'color: blue')
                         reconnect_attempts = 0
                         subscriptions[key].status = 'connected'
+                        send_all_puts()
                     }
 
                     // Return the update
@@ -644,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.22",
+  "version": "6.1.25",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {

package/statebus.js

@@ -430,9 +430,11 @@
         statelog(key, yellow, 'v', 'Deleting ' + key)
         // Call the to_delete handlers
         var handlers_called = bus.route(key, 'to_delete', key)
-        if (handlers_called === 0)
+        if (handlers_called === 0) {
             // And go ahead and delete if there aren't any!
             delete cache[key]
+            delete backup_cache[key]
+        }
 
         // Call the on_delete handlers
         bus.route(key, 'on_delete', cache[key] || {key: key}, t)
@@ -828,9 +830,10 @@
                     // except through an explicit .revise() function.
                     if (o) t.version = new_version()
 
-                    if (method === 'to_delete')
+                    if (method === 'to_delete') {
                         delete bus.cache[key]
-                    else if (method === 'to_save') {
+                        delete bus.backup_cache[key]
+                    } else if (method === 'to_save') {
                         bus.save.fire(o || arg, t)
                         bus.route(key, 'on_set_sync', o || arg, t)
                     } else {
@@ -1742,7 +1745,10 @@
                                                  client_fetched_keys.add(key) }
         bus(prefix).to_forget = function (key) { send({forget: key}),
                                                  client_fetched_keys.delete(key) }
-        bus(prefix).to_delete = function (key) { send({'delete': key}) }
+        bus(prefix).to_delete = function (key, t) {
+            t.done()
+            send({'delete': key})
+        }
 
         function connect () {
             nlog('[ ] trying to open ' + url)
@@ -2179,13 +2185,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
         }