statebus 7.0.14 → 7.0.15

package/client-library.js

@@ -40,10 +40,10 @@
         return new WebSocket(url + '/' + websocket_prefix + '/websocket')
         // return new SockJS(url + '/' + websocket_prefix)
     }
-    function client_creds (server_url) {
+    bus.client_creds = function client_creds () {
         // This function is only used for websocket connections.
         // http connections set the cookie on the server.
-        var me = bus.get('ls/me')
+        var me = JSON.parse(localStorage['ls/me'])
         bus.log('connect: me is', me)
         if (!me.client) {
             // Create a client id if we have none yet.
@@ -52,7 +52,7 @@
             me.client = c || (Math.random().toString(36).substring(2)
                               + Math.random().toString(36).substring(2)
                               + Math.random().toString(36).substring(2))
-            bus.set(me)
+            localStorage['ls/me'] = JSON.stringify(me)
         }
 
         set_cookie('peer', me.client)
@@ -86,30 +86,40 @@
             send_put(id)
         }
         function send_put (id) {
+            var the_put = puts.get(id)
             try {
-                puts.get(id).status = 'sending'
+                console.log('Sending a put!', {
+                    patches: the_put.patches,
+                    body: the_put.body
+                })
+
+                the_put.status = 'sending'
                 braid_fetch(
-                    puts.get(id).url,
+                    the_put.url,
                     {
                         method: 'put',
                         headers: {
                             'content-type': 'application/json',
                             'put-order': id,
+                            'peer': bus.client_creds().clientid
                         },
-                        body: puts.get(id).body
+                        body: the_put.body,
+                        patches: the_put.patches
                     }
                 ).then(function (res) {
                     if (res.status !== 200)
-                        console.error('Server gave error on PUT:',
-                                      e, 'for', puts.get(id).body)
+                        console.error(
+                            'Server gave error on PUT:', e,
+                            'for', {body: the_put.body, patches: the_put.patches}
+                        )
                     puts.delete(id)
                 }).catch(function (e) {
-                    console.error('Error on PUT, waiting...', puts.get(id).url)
-                    puts.get(id).status = 'waiting'
+                    console.error(e, 'Error on PUT, waiting...', the_put.url)
+                    the_put.status = 'waiting'
                 })
             } catch (e) {
-                console.error('Error on PUT, waiting...', puts.get(id).url)
-                puts.get(id).status = 'waiting'
+                console.error(e, 'Error on PUT, waiting...', the_put.url)
+                the_put.status = 'waiting'
             }
         }
         function retry_put (id) {
@@ -127,13 +137,24 @@
         bus(prefix).setter   = function (obj, t) {
             bus.set.fire(obj)
 
-            var put = {
-                url: url + rem_prefix(obj.key),
-                body: JSON.stringify(obj.val)
-            }
+            var put = {url: url + rem_prefix(obj.key)}
+
+            // Set the version and parents
             if (t.version) put.version = t.version
             if (t.parents) put.parents = t.parents
-            if (t.patch)   put.patch   = t.patch
+
+            // Do we have patches?
+            if (t.patch) {
+                put.patches = t.patch.map(patch => {
+                    var match = patch.match(/(.*) = (.*)/),
+                        range = match[1],
+                        content = match[2]
+                    return {unit: 'json', range, content}
+                })
+            }
+            // Then we just have a simple body.
+            else put.body = JSON.stringify(obj.val)
+
             var put_id = put_counter++
             puts.set(put_id, put)
             send_put(put_id)
@@ -168,7 +189,20 @@
 
             function subscribe (key, t) {
                 var aborter = new AbortController(),
-                    reconnect_attempts = 0
+                    reconnect_attempts = 0,
+                    reconnect = (e) => {
+                        if (subscriptions[key].status === 'aborted') {
+                            // Then this get is over and done with!
+                            delete subscriptions[key]
+                            return
+                        }
+
+                        // Else, reconnect!
+                        setTimeout(() => subscribe(key, t),
+                                   reconnect_attempts > 0 ? 5000 : 1500)
+                        subscriptions[key].status = 'reconnecting'
+                        reconnect_attempts++
+                    }
 
                 // Start the subscription!
                 braid_fetch(
@@ -180,35 +214,28 @@
                         method: 'get',
                         subscribe: true,
                         headers: {accept: 'application/json'},
-                        signal: aborter.signal
-                    }
-                ).andThen( function (new_version) {
-                    // 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(new_version.body))
-                    })
-                }).catch( function (e) {
-                    if (subscriptions[key].status === 'aborted') {
-                        // Then this get is over and done with!
-                        delete subscriptions[key]
-                        return
+                        signal: aborter.signal,
+                        // credentials: 'include'
                     }
+                ).then(res => res.subscribe(
+                    new_version => {
+                        // 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()
+                        }
 
-                    // Reconnect!
-                    setTimeout(function () { subscribe(key, t) },
-                               reconnect_attempts > 0 ? 5000 : 1500)
-                    subscriptions[key].status = 'reconnecting'
-                })
+                        // Return the update
+                        t.return({
+                            key: key,
+                            val: add_prefixes(JSON.parse(new_version.body))
+                        })
+                    },
+                    reconnect
+                )).catch(reconnect)
 
                 // Remember this subscription
                 subscriptions[key] = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statebus",
-  "version": "7.0.14",
+  "version": "7.0.15",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "bcrypt-nodejs": "0.0.3",
-    "braidify": "^0.1.23",
+    "braid-http": "^0.1.8",
     "chokidar": "^3.4.0",
     "cookie": "^0.3.1",
     "express": "^4.15.3",

package/server-library.js

@@ -1,7 +1,7 @@
 var fs = require('fs'),
     util = require('util')
 
-var braidify = require('braidify').http_server
+var braidify = require('braid-http').http_server
 
 
 function default_options (bus) { return {
@@ -142,6 +142,8 @@ function import_server (bus, make_statebus, options)
             console.log(req.method, req.url, req.headers.subscribe
                         ? 'Subscribe: ' + req.headers.subscribe : '')
 
+        braidify(req, res)
+
         // If this requests knows about Braid then we presume the programmer
         // knows that any client might make this cross-origin request.
         if (req.headers.version || req.headers.parents || req.headers.subscribe
@@ -171,7 +173,6 @@ function import_server (bus, make_statebus, options)
             // Make a temporary client bus
             var cbus = bus.bus_for_http_client(req, res)
 
-            braidify(req, res)
             if (req.subscribe)
                 res.startSubscription({ onClose: end_subscription })
             else
@@ -222,15 +223,21 @@ function import_server (bus, make_statebus, options)
         }
 
         else if (req.method === 'PUT') {
-            // Maybe the new state is expressed in patches
-            if (req.headers.patches) {
-                console.error("We don't actually handle PUT patches yet")
 
-                // var patches = await req.patches()
-                // console.log("...but we see these patches:", patches)
+            // Maybe the new state is expressed in patches
+            if (req.headers.patches || req.headers['content-range']) {
 
-                res.statusCode = 500
-                res.end()
+                var patches = req.patches().then(patches => {
+                    console.log("...and we see these patches:", patches)
+                    var statebus_patches = patches.map(patch =>
+                        patch.range + ' = ' + patch.content
+                    )
+                    var cbus = bus.bus_for_http_client(req, res)
+                    cbus.set(req.url.substr(1), {patch: statebus_patches})
+                    res.statusCode = 200
+                    res.end
+                    console.log('We just processed a patch!')
+                })
             } else {
                 // Otherwise, we assume the body is content-type: json
                 if (typeof req.headers['content-type'] !== 'string'
@@ -516,7 +523,7 @@ function import_server (bus, make_statebus, options)
                     if (message.patch) {
                         var o = bus.cache[message.set] || {key: message.set}
                         try {
-                            message.set = bus.apply_patch(o, message.patch[0])
+                            message.set = bus.apply_patch(o.val, message.patch[0])
                         } catch (e) {
                             console.error('Received bad sockjs message from '
                                           + conn.remoteAddress +': ', message, e)
@@ -2447,7 +2454,7 @@ function import_server (bus, make_statebus, options)
                 ['extras/coffee.js', 'extras/sockjs.js',
                  'statebus.js', 'client.js'].map((f) => fs.readFileSync('node_modules/statebus/' + f))
             files.unshift(fs.readFileSync(
-                'node_modules/braidify/braidify-client.js'
+                'node_modules/braid-http/braid-http-client.js'
             ))
             res.send(files.join(';\n'))
         })
@@ -2539,7 +2546,7 @@ function import_server (bus, make_statebus, options)
 function free_the_cors (req, res, next) {
     var free_the_cors = {
         "Access-Control-Allow-Origin": "*",
-        "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
+        "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, DELETE, UNSUBSCRIBE",
         "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, patches, cache-control, put-order"
     }
     Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]))

package/statebus.js

@@ -93,11 +93,24 @@
 
     var currently_saving
     function set (obj, t) {
-        // First let's handle diffs
+        // First let's handle patches.  We receive them as:
+        //
+        //     set("foo", {patch: ['.foo.bar = "blah"]})
+        //
+        // Note the `obj` will actually be a string, set to the key in this case.
+        //
         if (typeof obj === 'string' && t && t.patch) {
             if (typeof t.patch == 'string') t.patch = [t.patch]
             // Apply the patch locally
-            obj = apply_patch(bus.cache[obj] || {key: obj}, t.patch[0])
+            console.log('set: applying the patch!', {
+                key: obj,
+                val: bus.cache[obj],
+                patch: t.patch[0]
+            })
+            obj = {
+                key: obj,
+                val: apply_patch((bus.cache[obj] && bus.cache[obj].val), t.patch[0])
+            }
         }
 
         if (!('key' in obj) || typeof obj.key !== 'string') {
@@ -1272,7 +1285,7 @@
         get_base: Symbol('get_base')
     }
     function make_proxy () {
-        function item_proxy (base, o) {
+        function item_proxy (base, path, o) {
 
             // Primitives pass through unscathed
             if (typeof o === 'number'
@@ -1287,7 +1300,7 @@
             // We recursively descend through {key: ...} links
             if (typeof o === 'object' && 'link' in o) {
                 var new_base = bus.get(o.link)
-                return item_proxy(new_base, new_base.val)
+                return item_proxy(new_base, '', new_base.val)
             }
 
 
@@ -1307,12 +1320,20 @@
                         return true
                     if (typeof k === 'symbol')
                         return undefined
-                    return item_proxy(base, o[proxied_2_keyed(k)])
+
+                    // Compute the new path
+                    var new_path = path + '[' + JSON.stringify(k) + ']'
+                    return item_proxy(base, new_path, o[proxied_2_keyed(k)])
                 },
                 set: function set(o, k, v) {
                     var value = translate_fields(v, proxied_2_keyed)
                     o[proxied_2_keyed(k)] = value
-                    bus.set(base)
+                    var new_path = path + '[' + JSON.stringify(k) + ']'
+                    bus.set(
+                        base,
+                        // Forward the patch too
+                        {patch: [new_path + ' = ' + JSON.stringify(v)]}
+                    )
                     return true
                 },
                 has: function has(o, k) {
@@ -1320,6 +1341,7 @@
                 },
                 deleteProperty: function del (o, k) {
                     delete o[proxied_2_keyed(k)]
+                    return true // Report success to Proxy
                 }
                 // For function proxies:
                 //
@@ -1339,15 +1361,15 @@
                     return undefined
                 bogus_check(k)
                 var base = bus.get(k)
-                return item_proxy(base, base.val)
+                return item_proxy(base, '', base.val)
             },
             set: function set(o, key, val) {
-                bus.set({key: key,
-                          val: translate_fields(val, proxied_2_keyed)})
+                bus.set({key: key, val: translate_fields(val, proxied_2_keyed)})
                 return true
             },
             deleteProperty: function del (o, k) {
                 bus.delete(proxied_2_keyed(k))
+                return true // Report success to Proxy
             },
             // For function proxies:
             // apply: function apply (o, This, args) {
@@ -1552,11 +1574,25 @@
                     var t = {version: message.version,
                              parents: message.parents,
                              patch: message.patch}
-                    if (t.patch)
-                        msg.set = apply_patch(bus.cache[msg.set] || {key: msg.set},
-                                               message.patch[0])
+
+                    var obj
+
+                    // Are we receiving a patch?
+                    if (message.patch && typeof message.set === 'string') {
+                        // Then message.set is a key, and we are applying a
+                        // patch to the data at that key
+                        var key = message.set
+                        obj = apply_patch(bus.cache[key] && bus.cache[key].val,
+                                          message.patch[0])
+                    }
+
+                    // Then we're receiving the full state as an object
+                    else
+                        obj = message.set
+
                     if (!(t.version||t.parents||t.patch))
                         t = undefined
+
                     bus.set.fire(add_prefixes(message.set), t)
                 } catch (err) {
                     console.error('Received bad network message from '
@@ -1726,25 +1762,30 @@
             path = x[1],
             new_stuff = JSON.parse(x[2])
 
-        var path_segment = /^(\.([^\.\[]+))|(\[((-?\d+):)?(-?\d+)\])/
+        var path_segment = /^(\.?([^\.\[]+))|(\[((-?\d+):)?(-?\d+)\])|\[("(\\"|[^"])*")\]/
         var curr_obj = obj,
             last_obj = null
-        function de_neg (x) {
-            return x[0] === '-'
-                ? curr_obj.length - parseInt(x.substr(1))
-                : parseInt(x)
+        function de_neg (numstr) {
+            return numstr[0] === '-'
+                ? curr_obj.length - parseInt(numstr.substr(1))
+                : parseInt(numstr)
         }
 
+        console.log('Getting path', path, 'in obj', obj)
+
         while (true) {
             var match = path_segment.exec(path),
-                subpath = match[0],
-                field = match[2],
-                slice_start = match[5],
-                slice_end = match[6]
+                subpath = match ? match[0] : '',
+                field = match && match[2],
+                slice_start = match && match[5],
+                slice_end = match && match[6],
+                quoted_field = match && match[7]
 
             slice_start = slice_start && de_neg(slice_start)
             slice_end = slice_end && de_neg(slice_end)
 
+            if (quoted_field) field = JSON.parse(quoted_field)
+
             // console.log('Descending', {curr_obj, path, subpath, field, slice_start, slice_end, last_obj})
 
             // If it's the final item, set it