statebus 7.0.15 → 7.0.17

package/client-library.js

@@ -107,12 +107,15 @@
                         patches: the_put.patches
                     }
                 ).then(function (res) {
-                    if (res.status !== 200)
+                    if (res.status === 200) {
+                        console.log('PUT succeeded!')
+                        puts.delete(id)
+                    }
+                    else
                         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(e, 'Error on PUT, waiting...', the_put.url)
                     the_put.status = 'waiting'

package/package.json

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

package/server-library.js

@@ -233,10 +233,12 @@ function import_server (bus, make_statebus, options)
                         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!')
+                    var key = req.url.substr(1)
+                    cbus.get_once(key, (obj) => {
+                        cbus.set(key, {patch: statebus_patches})
+                        res.sendStatus(200)
+                        console.log('We just processed a patch!')
+                    })
                 })
             } else {
                 // Otherwise, we assume the body is content-type: json
@@ -2547,7 +2549,7 @@ function free_the_cors (req, res, next) {
     var free_the_cors = {
         "Access-Control-Allow-Origin": "*",
         "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"
+        "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, content-range, patches, cache-control, put-order"
     }
     Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]))
     if (req.method === 'OPTIONS') {

package/statebus.js

@@ -102,15 +102,15 @@
         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: applying the patch!', {
-                key: obj,
-                val: bus.cache[obj],
+                key: key,
+                obj: obj,
                 patch: t.patch[0]
             })
-            obj = {
-                key: obj,
-                val: apply_patch((bus.cache[obj] && bus.cache[obj].val), t.patch[0])
-            }
+            obj.val = apply_patch(obj.val, t.patch[0])
         }
 
         if (!('key' in obj) || typeof obj.key !== 'string') {