statebus 7.0.17 → 7.0.19

package/client-library.js

@@ -201,6 +201,7 @@
                         }
 
                         // Else, reconnect!
+                        console.log('Reconnecting due to', e)
                         setTimeout(() => subscribe(key, t),
                                    reconnect_attempts > 0 ? 5000 : 1500)
                         subscriptions[key].status = 'reconnecting'
@@ -232,10 +233,17 @@
                         }
 
                         // Return the update
-                        t.return({
-                            key: key,
-                            val: add_prefixes(JSON.parse(new_version.body))
-                        })
+                        if (new_version.body)
+                            // As a snapshot body
+                            t.return({
+                                key: key,
+                                val: add_prefixes(JSON.parse(new_version.body))
+                            })
+                        else if (new_version.patches)
+                            // As a patch
+                            bus.set.fire(key, {patch: new_version.patches.map(
+                                patch => patch.range + ' = ' + patch.content
+                            )})
                     },
                     reconnect
                 )).catch(reconnect)

package/package.json

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

package/statebus.js

@@ -186,6 +186,26 @@
             || executing_funk && executing_funk.latest_reaction_at
             || new_version()
 
+        // Handle patches.  We receive them as:
+        //
+        //     set.fire("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
+            var key = obj,
+                obj = bus.cache[key]
+
+            // console.log('set.fire: applying the patch!', {
+            //     key: key,
+            //     obj: obj,
+            //     patch: t.patch[0]
+            // })
+            obj.val = apply_patch(obj.val, t.patch[0])
+        }
+
         // Print a statelog entry
         if (obj.key && honking_at(obj.key)) {
             // Warning: Changes to *nested* objects will *not* be printed out!
@@ -1340,7 +1360,13 @@
                     return o.hasOwnProperty(proxied_2_keyed(k))
                 },
                 deleteProperty: function del (o, k) {
+                    var new_path = path + '[' + JSON.stringify(k) + ']'
                     delete o[proxied_2_keyed(k)]
+                    bus.set(
+                        base,
+                        // Forward the patch too
+                        {patch: [new_path + ' = ']}
+                    )
                     return true // Report success to Proxy
                 }
                 // For function proxies:
@@ -1771,7 +1797,7 @@
                 : parseInt(numstr)
         }
 
-        console.log('Getting path', path, 'in obj', obj)
+        // console.log('Getting path', JSON.stringify(path), 'in obj', obj)
 
         while (true) {
             var match = path_segment.exec(path),
@@ -1790,11 +1816,19 @@
 
             // If it's the final item, set it
             if (path.length == subpath.length) {
-                if (field)                               // Object
-                    curr_obj[field] = new_stuff
+                if (!subpath) return new_stuff
+                else if (field)                          // Object
+                    if (new_stuff === undefined)
+                        delete curr_obj[field]           // - Delete a field in object
+                    else
+                        curr_obj[field] = new_stuff      // - Set a field in object
+
                 else if (typeof curr_obj == 'string') {  // String
-                    console.assert(typeof new_stuff == 'string')
-                    if (!slice_start) {slice_start = slice_end; slice_end = slice_end+1}
+                    console.assert(typeof new_stuff === 'string')
+                    if (!slice_start) {
+                        slice_start = slice_end
+                        slice_end = slice_end + 1
+                    }
                     if (last_obj) {
                         var s = last_obj[last_field]
                         last_obj[last_field] = (s.slice(0, slice_start)