statebus 7.0.3 → 7.0.4

package/statebus.js

@@ -14,8 +14,8 @@
             && !(typeof key === 'object' && typeof key.key === 'string'))
             throw ('Error: get(key) called with key = '
                    + JSON.stringify(key))
-        key = key.key || key    // You can pass in an object instead of key
-                                // We should probably disable this in future
+        key = key.key || key  // You can pass in an object instead of key
+                              // We should probably disable this in future
         bogus_check(key)
 
         var called_from_reactive_funk = !callback
@@ -413,6 +413,7 @@
 
                 // Delete the cache entry...?
                 // delete cache[key]
+                // delete backup_cache[key]
                 delete gets_out[key]
                 delete to_be_forgotten[key]
             }, 200)
@@ -503,7 +504,6 @@
             var funk    = funks[k],
                 version = dirty_funks[k]
 
-            // console.log(funks[dirty_funks[i]].proxies_for)
             var p = funk.proxies_for
             if (p && p.priority) {
                 log('Clean-early:', funk_name(funk))
@@ -525,7 +525,7 @@
                 funk.react()
             }
         }
-        // log('We just cleaned up', dirty_funks.length, 'funks!')
+        // console.log('We just cleaned up', dirty_funks.length, 'funks!')
     }
 
     // Let's change this function to go through each key and grab the latest
@@ -537,7 +537,7 @@
         var result = []
         var keys = changed_keys.values()
 
-        //log(bus+' Cleaning up!', keys, 'keys, and', getters.length, 'getters')
+        // console.log(bus+' Finding rerunnable funcs for', keys, 'keys, and', Object.keys(dirty_getters).length, 'dirty_getters')
         for (var i=0; i<keys.length; i++) {          // Collect all keys
             // if (to_be_forgotten[keys[i]])
             //     // Ignore changes to keys that have been forgotten, but not
@@ -549,7 +549,7 @@
                 if (f.react) {
                     // Skip if it's already up to date
                     var v = f.getted_keys[JSON.stringify([this.id, keys[i]])]
-                    //log('re-run:', keys[i], f.statebus_id, f.getted_keys)
+                    // console.log('re-run:', keys[i], f.statebus_id, f.getted_keys)
                     if (v && v.indexOf(versions[keys[i]]) !== -1) {
                         log('skipping', funk_name(f), 'already at version', versions[keys[i]], 'proof:', v)
                         continue
@@ -580,7 +580,7 @@
         changed_keys.clear()
         dirty_getters = {}
 
-        //log('found', result.length, 'funks to re run')
+        // console.log('found', result.length, 'funks to re run')
 
         return result
     }
@@ -1258,8 +1258,8 @@
                 return o
 
             // We recursively descend through {key: ...} links
-            if (typeof o === 'object' && 'key' in o) {
-                var new_base = bus.get(o.key)
+            if (typeof o === 'object' && 'link' in o) {
+                var new_base = bus.get(o.link)
                 return item_proxy(new_base, new_base.val)
             }
 
@@ -1409,9 +1409,13 @@
         function rem_prefix (key) {
             return has_prefix.test(key) ? key.substr(preprefix.length) : key }
         function add_prefixes (obj) {
-            return bus.translate_keys(bus.clone(obj), add_prefix) }
+            var keyed = bus.translate_keys(bus.clone(obj), add_prefix)
+            return bus.translate_links(bus.clone(keyed), add_prefix)
+        }
         function rem_prefixes (obj) {
-            return bus.translate_keys(bus.clone(obj), rem_prefix) }
+            var keyed = bus.translate_keys(bus.clone(obj), rem_prefix)
+            return bus.translate_links(bus.clone(keyed), rem_prefix)
+        }
 
         bus(prefix).to_set   = function (obj, t) {
             bus.set.fire(obj)
@@ -1446,9 +1450,9 @@
                     var i = []
                     function intro (o) {i.push(JSON.stringify({set: o}))}
                     if (creds.clientid)
-                        intro({key: 'current_user', client: creds.clientid})
+                        intro({key: 'current_user', val: {client: creds.clientid}})
                     if (creds.name && creds.pass)
-                        intro({key: 'current_user', login_as: {name: creds.name, pass: creds.pass}})
+                        intro({key: 'current_user', val: {login_as: {name: creds.name, pass: creds.pass}}})
                     // Todo: make this kinda thing work:
                     if (creds.private_key && creds.public_key) {
                         // Send public_key... start waiting for a
@@ -1540,6 +1544,14 @@
         return {send: send, sock: sock, close: function () {done = true; sock.close()}}
     }
 
+    bus.client_creds = function client_creds (server_url) {
+        // This default implementation just creates a different random id each time
+        // we connect.  Override this if you want a client ID that persists.
+        return {clientid: (Math.random().toString(36).substring(2)
+                           + Math.random().toString(36).substring(2)
+                           + Math.random().toString(36).substring(2))}
+    }
+
     function net_automount () {
         var bus = this
         var old_route = bus.route
@@ -1586,6 +1598,30 @@
         return k.replace(/(_$)/, '')
     }
 
+    // ************************************************
+    // Translating the URLs under links of state
+    function translate_links (obj, f) {
+        // Recurse through each element in arrays
+        if (Array.isArray(obj))
+            for (var i=0; i < obj.length; i++)
+                translate_links(obj[i], f)
+
+        // Recurse through each property on objects
+        else if (typeof obj === 'object')
+            for (var k in obj) {
+                if (k === 'link')
+                    if (typeof obj[k] == 'string')
+                        obj[k] = f(obj[k])
+                    else if (Array.isArray(obj[k]))
+                        for (var i=0; i < obj[k].length; i++) {
+                            if (typeof obj[k][i] === 'string')
+                                obj[k][i] = f(obj[k][i])
+                        }
+                translate_links(obj[k], f)
+            }
+        return obj
+    }
+
 
     // ************************************************
     // Translating fields of objects
@@ -1863,13 +1899,13 @@
         if (a_array !== b_array) return ' = ' + JSON.stringify(b)
         if (a_array) {
             if (a.length === b.length-1
-                && !deep_equals(a[a.length], b[b.length])) {
-                return '.push(' +JSON.stringify(b[b.length]) + ')'
+                && deep_equals(a[a.length-1], b[b.length-2])) {
+                return '.push(' +JSON.stringify(b[b.length-1]) + ')'
             }
             for (var i=0; i < a.length; i++) {
                 var tmp = sorta_diff (a[i], b[i])
                 if (tmp)
-                    return '['+i+'] = '+tmp
+                    return '['+i+']'+tmp
             }
             return null
         }
@@ -2070,7 +2106,7 @@
         if (!(key in bogus_keys))
             return
 
-        var msg = "Sorry, statebus.js currently prohibits use of the key \""+key+"\", and in fact all of these keys: " + Object.keys(bogus_keys).join(', ') + ".  This is because Javascript is kinda lame, and even empty objects like \"{}\" have the \""+key+"\" field defined on them.  Try typing this in your Javascript console: \"({}).constructor\" -- it returns a function instead of undefined!  We could work around it by meticulously replacing every \"obj[key]\" with \"obj.hasOwnProperty(key) && obj[key]\" in the statebus code, but that will make the source more difficult to understand.  So please contact us if this use-case is important for you, and we'll consider doing it.  We're hoping that, for now, our users don't need to use these keys."
+        var msg = "Sorry, statebus.js currently prohibits use of the key \""+key+"\", and in fact all of these keys: " + Object.keys(bogus_keys).join(', ') + ".  This is because Javascript is kinda lame, and even empty objects like \"{}\" have the \""+key+"\" field defined on them.  Try typing this in your Javascript console: \"({}).constructor\" -- it returns a function instead of undefined!  Mike needs to work around it by replacing every \"obj[key]\" with \"obj.hasOwnProperty(key) && obj[key]\" in the statebus code, or switching to a Map() object.  Please contact him and let him know where this is impacting you, so he can bump the priority on it."
         console.error(msg)
         throw 'Invalid key'
     }
@@ -2083,7 +2119,7 @@
                'funk_key funk_name funks key_id key_name id',
                'pending_gets gets_in gets_out loading_keys loading once',
                'global_funk busses rerunnable_funks',
-               'escape_keys unescape_keys translate_keys apply_patch',
+               'escape_keys unescape_keys translate_keys translate_links apply_patch',
                'keyed_2_proxied proxied_2_keyed translate_fields',
                'ws_mount net_automount message_method',
                'parse Set One_To_Many clone extend deep_map deep_equals prune validate sorta_diff log deps symbols'
@@ -2110,7 +2146,7 @@
     bus.libs = {}
 
     if (nodejs)
-        require('./servers').import_server(bus, options)
+        require('./servers').import_server(bus, make_bus, options)
     
     bus.render_when_loading = true
     return bus