statebus 7.0.27 → 7.0.30

package/client-library.js

@@ -147,14 +147,8 @@
             if (t.parents) put.parents = t.parents
 
             // 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}
-                })
-            }
+            if (t.patches) put.patches = t.patches
+
             // Then we just have a simple body.
             else put.body = JSON.stringify(obj.val)
 
@@ -222,7 +216,7 @@
                         // credentials: 'include'
                     }
                 ).then(res => res.subscribe(
-                    new_version => {
+                    update => {
                         // New update received!
                         if (subscriptions[key].status === 'connecting') {
                             console.log('%c[*] opened ' + key,
@@ -233,17 +227,15 @@
                         }
 
                         // Return the update
-                        if (new_version.body)
+                        if (update.body)
                             // As a snapshot body
                             t.return({
                                 key: key,
-                                val: add_prefixes(JSON.parse(new_version.body))
+                                val: add_prefixes(JSON.parse(update.body))
                             })
-                        else if (new_version.patches)
+                        else if (update.patches)
                             // As a patch
-                            bus.set.fire(key, {patch: new_version.patches.map(
-                                patch => patch.range + ' = ' + patch.content
-                            )})
+                            bus.set.fire(key, {patches: update.patches})
                     },
                     reconnect
                 )).catch(reconnect)

package/extras/tests.js

@@ -107,6 +107,15 @@ test(function applying_patches (done) {
         [[1,2,3], '[-1:-0] = [0, 0, 0]', [1, 2, 0, 0, 0]]
     ]
 
+    // Convert to braid patch format
+    for (var i=0; i<tests.length; i++) {
+        var match = tests[i][1].match(/(.*) = (.*)/)
+        tests[i][1] = {unit: 'json',
+                       range: match[1],
+                       content: match[2]}
+    }
+
+    // Test them
     for (var i=0; i<tests.length; i++) {
         var x = bus.apply_patch(tests[i][0], tests[i][1])
         assert(bus.deep_equals(x, tests[i][2]),

package/package.json

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

package/server-library.js

@@ -229,13 +229,10 @@ function import_server (bus, make_statebus, options)
 
                 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)
                     var key = req.url.substr(1)
                     cbus.get_once(key, (obj) => {
-                        cbus.set(key, {patch: statebus_patches})
+                        cbus.set(key, {patches})
                         res.sendStatus(200)
                         console.log('We just processed a patch!')
                     })
@@ -463,8 +460,8 @@ function import_server (bus, make_statebus, options)
                 var msg = {set: obj}
                 if (t.version) msg.version = t.version
                 if (t.parents) msg.parents = t.parents
-                if (t.patch)   msg.patch =   t.patch
-                if (t.patch)   msg.set    = msg.set.key
+                if (t.patches)   msg.patches =   t.patches
+                if (t.patches)   msg.set    = msg.set.key
                 msg = JSON.stringify(msg)
 
                 if (master.simulate_network_delay) {
@@ -489,7 +486,7 @@ function import_server (bus, make_statebus, options)
                           ||
                           (method === 'set'
                            && master.validate(message, {set: '*',
-                                                        '?parents': 'array', '?version': 'string', '?patch': 'array'})
+                                                        '?parents': 'array', '?version': 'string', '?patches': 'array'})
                            && (typeof(message.set) === 'string'
                                || (typeof(message.set) === 'object'
                                    && typeof(message.set.key === 'string'))))
@@ -522,10 +519,10 @@ function import_server (bus, make_statebus, options)
                     break
                 case 'set':
                     message.version = message.version || client.new_version()
-                    if (message.patch) {
+                    if (message.patches) {
                         var o = bus.cache[message.set] || {key: message.set}
                         try {
-                            message.set = bus.apply_patch(o.val, message.patch[0])
+                            message.set = bus.apply_patch(o.val, message.patches[0])
                         } catch (e) {
                             console.error('Received bad sockjs message from '
                                           + conn.remoteAddress +': ', message, e)
@@ -535,7 +532,7 @@ function import_server (bus, make_statebus, options)
                     client.set(message.set,
                                 {version: message.version,
                                  parents: message.parents,
-                                 patch: message.patch})
+                                 patches: message.patches})
                     if (our_gets_in[message.set.key]) {  // Store what we've seen if we
                                                              // might have to publish it later
                         client.log('Adding', message.set.key+'#'+message.version,

package/statebus.js

@@ -95,22 +95,22 @@
     function set (obj, t) {
         // First let's handle patches.  We receive them as:
         //
-        //     set("foo", {patch: ['.foo.bar = "blah"]})
+        //     set("foo", {patches: [{...}, ...]})
         //
         // 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]
+        if (typeof obj === 'string' && t && t.patches) {
+            if (!Array.isArray(t.patches)) t.patches = [t.patches]
             // Apply the patch locally
             var key = obj,
                 obj = bus.cache[key]
 
-            console.log('set: applying the patch!', {
+            console.log('set: applying the patches!', {
                 key: key,
                 obj: obj,
-                patch: t.patch[0]
+                patches: t.patches[0]
             })
-            obj.val = apply_patch(obj.val, t.patch[0])
+            obj.val = apply_patch(obj.val, t.patches[0])
         }
 
         if (!('key' in obj) || typeof obj.key !== 'string') {
@@ -188,22 +188,22 @@
 
         // Handle patches.  We receive them as:
         //
-        //     set.fire("foo", {patch: ['.foo.bar = "blah"]})
+        //     set.fire("foo", {patches: [{...}, ...]})
         //
         // 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
+            if (!Array.isArray(t.patches)) t.patches = [t.patches]
+            // Apply the patches locally
             var key = obj,
                 obj = bus.cache[key]
 
-            // console.log('set.fire: applying the patch!', {
+            // console.log('set.fire: applying the patches!', {
             //     key: key,
             //     obj: obj,
-            //     patch: t.patch[0]
+            //     patch: t.patches[0]
             // })
-            obj.val = apply_patch(obj.val, t.patch[0])
+            obj.val = apply_patch(obj.val, t.patches[0])
         }
 
         // Print a statelog entry
@@ -1337,7 +1337,7 @@
 
 
             return new Proxy(o, {
-                get: function get(o, k) {
+                get: function (o, k) {
                     if (k === 'inspect' || k === 'valueOf')
                         return undefined
                     // if (custom_inspect && k === custom_inspect)
@@ -1349,31 +1349,41 @@
 
                     // Compute the new path
                     var new_path = path + '[' + JSON.stringify(k) + ']'
-                    return item_proxy(base, new_path, o[escape_field_to_nelson(escape_field_to_bus(k))])
+                    return item_proxy(base, new_path, o[escape_field_to_bus(escape_field_to_nelson(k))])
                 },
-                set: function set(o, k, v) {
+                set: function (o, k, v) {
                     var value = translate_fields(v, field => escape_field_to_bus(escape_field_to_nelson(field)))
-                    o[escape_field_to_bus(k)] = value
+                    o[escape_field_to_bus(escape_field_to_nelson(k))] = value
                     var new_path = path + '[' + JSON.stringify(k) + ']'
                     bus.set(
                         base,
-                        // Forward the patch too
-                        {patch: [new_path + ' = ' + JSON.stringify(v)]}
+                        // Forward the patches too
+                        {patches: [{unit: 'json',
+                                    range: new_path,
+                                    content: JSON.stringify(v)}]}
                     )
                     return true
                 },
-                has: function has(o, k) {
+                has: function (o, k) {
                     // if (custom_inspect && k === custom_inspect)
                     //     return true
-                    return o.hasOwnProperty(escape_field_to_bus(k))
+                    return o.hasOwnProperty(escape_field_to_bus(escape_field_to_nelson(k)))
+                },
+                ownKeys: function () {
+                    return Object.keys(o).map(unescape_field_from_nelson).map(unescape_field_from_bus)
+                },
+                getOwnPropertyDescriptor: function (target, key) {
+                    return { enumerable: true, configurable: true, value: this.get(o, key) }
                 },
                 deleteProperty: function del (o, k) {
                     var new_path = path + '[' + JSON.stringify(k) + ']'
-                    delete o[escape_field_to_bus(k)]
+                    delete o[escape_field_to_bus(escape_field_to_nelson(k))]
                     bus.set(
                         base,
-                        // Forward the patch too
-                        {patch: [new_path + ' = ']}
+                        // Forward the patches too
+                        {patches: [{unit: 'json',
+                                    range: new_path,
+                                    content: undefined}]}
                     )
                     return true // Report success to Proxy
                 }
@@ -1429,9 +1439,10 @@
     if (!nodejs)
         window.devtoolsFormatters = [{
             header: function (x) {
-                if (x[symbols.is_proxy])
+                if (x[symbols.is_proxy]) {
                     return ['span', {style: 'background-color: #fffbe5; padding: 3px;'},
-                            JSON.stringify(unescape_from_nelson(unescape_from_bus(x)))]
+                            JSON.stringify(x)]
+                }
                 // For function proxies:
                 // JSON.stringify(x(), null, 2)]
             },
@@ -1510,8 +1521,8 @@
             var x = {set: 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.set    = rem_prefix(x.set.key)
+            if (t.patches) x.patches = t.patches
+            if (t.patches) x.set     = rem_prefix(x.set.key)
             send(x)
         }
         bus(prefix).getter  = function (key) { send({get: key}),
@@ -1612,24 +1623,24 @@
                     bus.log('net client received', message)
                     var t = {version: message.version,
                              parents: message.parents,
-                             patch: message.patch}
+                             patches: message.patches}
 
                     var obj
 
-                    // Are we receiving a patch?
-                    if (message.patch && typeof message.set === 'string') {
+                    // Are we receiving a patches?
+                    if (message.patches && 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])
+                                          message.patches[0])
                     }
 
                     // Then we're receiving the full state as an object
                     else
                         obj = message.set
 
-                    if (!(t.version||t.parents||t.patch))
+                    if (!(t.version||t.parents||t.patches))
                         t = undefined
 
                     bus.set.fire(add_prefixes(message.set), t)
@@ -1789,9 +1800,9 @@
         // The final object can be a slice
         // Set the value in the final object
 
-        var match = patch.match(/(.*) = (.*)/),
-            path = match[1],
-            new_stuff = match[2].length ? JSON.parse(match[2]) : undefined
+        console.assert(patch.unit === 'json', "Can't apply non-json patches")
+
+        var path = patch.range, new_stuff = JSON.parse(patch.content)
 
         var path_segment = /^(\.?([^\.\[]+))|(\[((-?\d+):)?(-?\d+)\])|\[("(\\"|[^"])*")\]/
         var curr_obj = obj,