statebus 7.0.11 → 7.0.13

package/extras/tests.js

@@ -1122,22 +1122,22 @@ function setup_servers () {
     c.ws_mount('/*', 'statei://localhost:' + port)
 
     s.set({key: 'users',
-            val: [ {link: 'user/1'},
-                   {link: 'user/2'},
-                   {link: 'user/3'} ] })
-    s.set({ key: 'user/1', val: {
+            val: [ {link: '@1'},
+                   {link: '@2'},
+                   {link: '@3'} ] })
+    s.set({ key: '@1', val: {
         name: 'mike',
         email: 'toomim@gmail.com',
         admin: true,
         pass: '$2a$10$Ti7BgAZS8sB0Z62o2NKsIuCdmU3q9xP7jexVccTcG19Y8qpBpl/1y'
     }})
-    s.set({ key: 'user/2', val: {
+    s.set({ key: '@2', val: {
         name: 'j',
         email: 'jtoomim@gmail.com',
         admin: true,
         pass: '$2a$10$Ti7BgAZS8sB0Z62o2NKsIuCdmU3q9xP7jexVccTcG19Y8qpBpl/1y'
     }})
-    s.set({ key: 'user/3', val: {
+    s.set({ key: '@3', val: {
         name: 'boo',
         email: 'boo@gmail.com',
         admin: false,
@@ -1260,7 +1260,7 @@ test(function create_account (done) {
     // Log out
     delay(600, () => {
         assert(cu.val.logged_in)
-        assert(cu.val.user.link === '/user/bob')
+        assert(cu.val.user.link === '/@bob')
 
         log('Now let\'s log out!')
         cu.val.logout = true; c.set(cu)
@@ -1276,7 +1276,7 @@ test(function create_account (done) {
     
     delay(600, () => {
         assert(cu.val.logged_in)
-        assert(cu.val.user.link === '/user/bob')
+        assert(cu.val.user.link === '/@bob')
         done()
     })
 })
@@ -1521,7 +1521,7 @@ if (false) {
             // Logged in as mike
             [(u.logged_in
               && u.user.name === 'mike'
-              && u.user.key === '/user/1'
+              && u.user.key === '/@1'
 
               // We can see our email
               && u.user.email
@@ -1547,7 +1547,7 @@ if (false) {
             // Logged in as j
             [(u.logged_in
               && u.user.name === 'j'
-              && u.user.key === '/user/2'
+              && u.user.key === '/@2'
 
               // We can see j's email
               && u.user.email
@@ -1564,10 +1564,10 @@ if (false) {
         c('/current_user').on_set = function (o) {
             //if (o.user && o.user.name === 'j') {
             // log(s.userbus.deps('/current_user'))
-            // log(s.userbus.deps('/user/2'))
+            // log(s.userbus.deps('/@2'))
             //}
         }
-        c('/user/*').on_set = function (o) {
+        c('/@*').on_set = function (o) {
             //log('-> Got new', o.key, o.email ? 'with email' : '')
         }
         c('/current_user').on_set = function (o) {
@@ -1575,9 +1575,9 @@ if (false) {
         }
         c(function loop () {
             u = c.get('/current_user')
-            user1 = c.get('/user/1')
-            user2 = c.get('/user/2')
-            user3 = c.get('/user/3')
+            user1 = c.get('/@1')
+            user2 = c.get('/@2')
+            user3 = c.get('/@3')
             var st = states()
 
             if (phase===1)
@@ -1613,12 +1613,12 @@ if (false) {
         var cu = c.get('/current_user')
         c.set({key: '/current_user', val: {create_account: {name: 'a', pass: 'a'}}})
         c.set({key: '/current_user', val: {login_as: {name: 'a', pass: 'a'}}})
-        var a_closet = c.get('/user/a/foo')
-        var a_private = c.get('/user/a/private/foo')
+        var a_closet = c.get('/@a/foo')
+        var a_private = c.get('/@a/private/foo')
 
         delay(400, () => {
-            c.set({key: '/user/a/foo', _: 3})
-            c.set({key: '/user/a/private/foo', _: 4})
+            c.set({key: '/@a/foo', _: 3})
+            c.set({key: '/@a/private/foo', _: 4})
         })
 
         // User A can see it

package/package.json

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

package/server-library.js

@@ -2054,7 +2054,9 @@ function import_server (bus, make_statebus, options)
             o.val.pass = o.val.pass && require('bcrypt-nodejs').hashSync(o.val.pass)
             u.val.pass = o.val.pass || u.val.pass
 
-            // // Users can have pictures (remove this soon)
+            // // Allow clients to save a base64 image in the .pic field,
+            // // which we'll convert into an image file here.  (Note: removed.
+            // // There are more elegant solutions possible now.)
             // // Bug: if user changes name, this picture's url doesn't change.
             // if (o.pic && o.pic.indexOf('data:image') > -1) {
             //     var img_type = o.pic.match(/^data:image\/(\w+);base64,/)[1]
@@ -2063,19 +2065,19 @@ function import_server (bus, make_statebus, options)
             //     // ensure that the uploads directory exists
             //     if (!fs.existsSync(upload_dir))
             //         fs.mkdirSync(upload_dir)
-
+            //
             //     // bug: users with the same name can overwrite each other's files
             //     u.pic = u.name + '.' + img_type
             //     fs.writeFile(upload_dir + u.pic, b64, {encoding: 'base64'})
             // }
 
             // For anything else, go ahead and add it to the user object
-            var protected = {key:1, name:1, /*pic:1,*/ pass:1}
+            var reserved = {'key':true, 'name':true, 'pass':true}
             for (var k in o.val)
-                if (!protected.hasOwnProperty(k))
+                if (!reserved.hasOwnProperty(k))
                     u.val[k] = o.val[k]
             for (var k in u.val)
-                if (!protected.hasOwnProperty(k) && !o.val.hasOwnProperty(k))
+                if (!reserved.hasOwnProperty(k) && !o.val.hasOwnProperty(k))
                     delete u.val[k]
 
             master.set(u)

package/statebus.js

@@ -1673,7 +1673,7 @@
         }
 
         // Recurse through each property on objects
-        else if (typeof input === 'object') {
+        else if (typeof input === 'object' && input !== null) {
             var new_obj = {}
             for (var k in input)
                 new_obj[f(k, input)] = translate_fields(input[k], f)