statebus 6.1.22 → 7.0.2

package/{server.js → servers.js}

@@ -1,13 +1,7 @@
 var fs = require('fs'),
     util = require('util')
 
-// Import braidify if it's available
-try {
-    var braidify = require('braidify').http_server
-    console.log('Found braidify library. Braid-HTTP enabled!')
-} catch (e) {
-    var braidify = undefined
-}
+var braidify = require('braidify').http_server
 
 
 function default_options (bus) { return {
@@ -77,7 +71,6 @@ function import_server (bus, options)
         bus.express = express()
         bus.http = express.Router()
         bus.install_express(bus.express)
-        bus.initialize_braid_http()
 
         // use gzip compression if available
         try { bus.http.use(require('compression')())
@@ -106,24 +99,11 @@ function import_server (bus, options)
                 bus.sync_files(x.state_path, x.fs_path)
         })
 
-        // Free the CORS for Braid requests!
-        bus.express.use((req, res, next) => {
-            // If this requests knows about Braid then we presume the
-            // programmer knows that any client might make this cross-origin
-            // request.
-            if (req.version || req.parents || req.subscribe
-                || req.headers.subscribe
-                || req.method === 'OPTIONS')
-                free_the_cors(req, res, next)
-            else
-                next()
-        })
-
         // User will put his routes in here
         bus.express.use(bus.http)
 
         // Connect bus to the HTTP server
-        bus.express.use(bus.http_handlers)
+        bus.express.use(bus.http_in)
 
         // Serve Client Coffee
         bus.serve_client_coffee()
@@ -142,18 +122,18 @@ function import_server (bus, options)
             // Now handle backup handlers
             if (count === 0) {
 
-                // A save to master without a to_save defined should be
+                // A set to master without a to_set defined should be
                 // automatically reflected to all clients.
-                if (method === 'to_save') {
-                    bus.save.fire(arg, t)
+                if (method === 'to_set') {
+                    bus.set.fire(arg, t)
                     bus.route(arg.key, 'on_set_sync', arg, t)
                     count++
                 }
 
-                // A fetch to master without a to_fetch defined should go to
+                // A get to master without a to_get defined should go to
                 // the database, if we have one.
-                if (method === 'to_fetch') {
-                    bus.db_fetch(key)
+                if (method === 'to_get') {
+                    bus.db_get(key)
                     // This basically renders the count useless-- you probably
                     // don't want to wrap this route() with another route().
                     count++
@@ -173,28 +153,18 @@ function import_server (bus, options)
         }
     },
 
-    initialize_braid_http: function () {
-        // Set up default linked json converters
-        if (bus.options.braid_mode) {
-            bus.to_http_body = (o) => JSON.stringify(o.val)
-            bus.state = bus.braid_proxy()
-        } else
-            bus.to_http_body = (o) => {
-                var unwrap = (Object.keys(o).length === 2
-                              && '_' in o
-                              && typeof o._ === 'string')
-                // To do: translate pointers as keys
-                return unwrap ? o._ : JSON.stringify(o)
-            }
+    // Connect HTTP GET and PUT to our Get and Set
+    http_in: function (req, res, next) {
+        if (bus.honk)
+            console.log(req.method, req.url, req.headers.subscribe
+                        ? 'Subscribe: ' + req.headers.subscribe : '')
 
-        bus.from_http_body = (key, body) => ({
-            key,
-            val: JSON.parse(body)
-        })
-    },
+        // If this requests knows about Braid then we presume the programmer
+        // knows that any client might make this cross-origin request.
+        if (req.headers.version || req.headers.parents || req.headers.subscribe
+            || req.method === 'OPTIONS')
+            free_the_cors(req, res)
 
-    // Connect HTTP GET and PUT to our Fetch and Save
-    http_handlers: function (req, res, next) {
         if (req.method === 'GET') {
 
             // Make a temporary client bus
@@ -206,45 +176,32 @@ function import_server (bus, options)
                 res.end()
             }
 
-            braidify && braidify(req, res)
-            if (req.subscribe) {
+            braidify(req, res)
+            if (req.subscribe)
                 res.startSubscription({ onClose: end_it_all })
-                console.log('yay subscription!')
-            } else
+            else
                 res.statusCode = 200
 
-            // Do the fetch
-            cbus.honk = 'statelog'
+            // Do the get
+            // cbus.honk = 'statelog'
             var key = req.path.substr(1)
-            cbus.fetch(key, cb = (o) => {
-                var body = bus.to_http_body(o)
+            cbus.get(key, cb = (o) => {
+                var body = to_http_body(o)
 
                 // If we're braiding, send via subscription
-                if (braidify)
-                    // Note: if body === undefined, we need to send the
-                    // equivalent of a 404.  This is missing in braid spec:
-                    // https://github.com/braid-org/braid-spec/issues/110
-                    res.sendVersion({body: body || 'null'})
-
-                // Or just return the current version
-                else {
-                    if (body !== undefined)
-                        res.send(body)
-                    else {
-                        res.statusCode = 404
-                        res.end()
-                    }
-                }
+
+                // Note: if body === undefined, we need to send the
+                // equivalent of a 404.  This is missing in braid spec:
+                // https://github.com/braid-org/braid-spec/issues/110
+                res.sendVersion({body: body || 'null'})
 
                 // And shut down the connection if there's no subscription
-                if (!braidify || !req.subscribe)
+                if (!req.subscribe)
                     end_it_all()
             })
         }
 
         else if (req.method === 'PUT') {
-            console.log('Got a put with body', req.body)
-
             // Make a temporary client bus
             var cbus = bus.bus_for_http_client(req, res)
 
@@ -266,16 +223,15 @@ function import_server (bus, options)
                 req.on('data', chunk => {body += chunk.toString()})
                 req.on('end', () => {
                     try {
-                        console.log('gonna parse', body)
                         var path = req.url.substr(1)
-                        var obj = bus.from_http_body(path, body)
+                        var obj = from_http_body(path, body)
                     } catch (e) {
                         console.error('Error: PUT body was not valid json', e)
                         res.statusCode = 500
                         res.end()
                         return
                     }
-                    cbus.save(obj)
+                    cbus.set(obj)
                     res.statusCode = 200
                     res.end()
                 })
@@ -296,7 +252,7 @@ function import_server (bus, options)
         // Log in as the client
         cbus.serves_auth({remoteAddress: req.connection.remoteAddress}, bus)
         bus.options.client(cbus)
-        cbus.save({key: 'current_user', client: req.client})
+        cbus.set({key: 'current_user', client: req.client})
         return cbus
     },
 
@@ -346,7 +302,7 @@ function import_server (bus, options)
                         bus.port = next_port_attempt
                         return result
                     } catch (e) {
-                        if (next_port_attempt < 3006) next_port_attempt = 3006
+                        if (next_port_attempt < 3007) next_port_attempt = 3007
                         else next_port_attempt++
                     }
             }
@@ -399,8 +355,8 @@ function import_server (bus, options)
         // var client_busses = {}  // XXX work in progress
         var log = master.log
         if (client_bus_func) {
-            master.save({key: 'connections'}) // Clean out old sessions
-            var connections = master.fetch('connections')
+            master.set({key: 'connections'}) // Clean out old sessions
+            var connections = master.get('connections')
         }
         var s = require('sockjs').createServer({
             sockjs_url: 'https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js',
@@ -419,7 +375,7 @@ function import_server (bus, options)
 
                 connections[conn.id] = {client: conn.id, // client is deprecated
                                         id: conn.id}
-                master.save(connections)
+                master.set(connections)
 
                 var client = require('./statebus')()
                 client.label = 'client' + client_num++
@@ -429,15 +385,15 @@ function import_server (bus, options)
             } else
                 var client = master
 
-            var our_fetches_in = {}  // Every key that this socket has fetched
+            var our_gets_in = {}  // Every key that this socket has got
             log('sockjs_s: New connection from', conn.remoteAddress)
             function sockjs_pubber (obj, t) {
                 // log('sockjs_pubber:', obj, t)
-                var msg = {save: obj}
+                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.save    = msg.save.key
+                if (t.patch)   msg.set    = msg.set.key
                 msg = JSON.stringify(msg)
 
                 if (master.simulate_network_delay) {
@@ -456,16 +412,16 @@ function import_server (bus, options)
                     var method = bus.message_method(message)
 
                     // Validate the message
-                    if (!((method === 'fetch'
-                           && master.validate(message, {fetch: 'string',
+                    if (!((method === 'get'
+                           && master.validate(message, {get: 'string',
                                                         '?parent': 'string', '?version': 'string'}))
                           ||
-                          (method === 'save'
-                           && master.validate(message, {save: '*',
+                          (method === 'set'
+                           && master.validate(message, {set: '*',
                                                         '?parents': 'array', '?version': 'string', '?patch': 'array'})
-                           && (typeof(message.save) === 'string'
-                               || (typeof(message.save) === 'object'
-                                   && typeof(message.save.key === 'string'))))
+                           && (typeof(message.set) === 'string'
+                               || (typeof(message.set) === 'object'
+                                   && typeof(message.set.key === 'string'))))
                           ||
                           (method === 'forget'
                            && master.validate(message, {forget: 'string'}))
@@ -482,55 +438,55 @@ function import_server (bus, options)
                 }
 
                 switch (method) {
-                case 'fetch':
-                    our_fetches_in[message.fetch] = true
-                    client.fetch(message.fetch, sockjs_pubber)
+                case 'get':
+                    our_gets_in[message.get] = true
+                    client.get(message.get, sockjs_pubber)
                     break
                 case 'forget':
-                    delete our_fetches_in[message.forget]
+                    delete our_gets_in[message.forget]
                     client.forget(message.forget, sockjs_pubber)
                     break
                 case 'delete':
                     client.delete(message['delete'])
                     break
-                case 'save':
+                case 'set':
                     message.version = message.version || client.new_version()
                     if (message.patch) {
-                        var o = bus.cache[message.save] || {key: message.save}
+                        var o = bus.cache[message.set] || {key: message.set}
                         try {
-                            message.save = bus.apply_patch(o, message.patch[0])
+                            message.set = bus.apply_patch(o, message.patch[0])
                         } catch (e) {
                             console.error('Received bad sockjs message from '
                                           + conn.remoteAddress +': ', message, e)
                             return
                         }
                     }
-                    client.save(message.save,
+                    client.set(message.set,
                                 {version: message.version,
                                  parents: message.parents,
                                  patch: message.patch})
-                    if (our_fetches_in[message.save.key]) {  // Store what we've seen if we
+                    if (our_gets_in[message.set.key]) {  // Store what we've seen if we
                                                              // might have to publish it later
-                        client.log('Adding', message.save.key+'#'+message.version,
+                        client.log('Adding', message.set.key+'#'+message.version,
                                    'to pubber!')
-                        sockjs_pubber.has_seen(client, message.save.key, message.version)
+                        sockjs_pubber.has_seen(client, message.set.key, message.version)
                     }
                     break
                 }
 
-                // validate that our fetches_in are all in the bus
-                for (var key in our_fetches_in)
-                    if (!client.fetches_in.has(key, master.funk_key(sockjs_pubber)))
+                // validate that our gets_in are all in the bus
+                for (var key in our_gets_in)
+                    if (!client.gets_in.has(key, master.funk_key(sockjs_pubber)))
                         console.trace("***\n****\nFound errant key", key,
                                       'when receiving a sockjs', method, 'of', message)
                 //log('sockjs_s: done with message')
             })
             conn.on('close', function() {
                 log('sockjs_s: disconnected from', conn.remoteAddress, conn.id, client.id)
-                for (var key in our_fetches_in)
+                for (var key in our_gets_in)
                     client.forget(key, sockjs_pubber)
                 if (client_bus_func) {
-                    delete connections[conn.id]; master.save(connections)
+                    delete connections[conn.id]; master.set(connections)
                     master.delete('connection/' + conn.id)
                     client.delete_bus()
                 }
@@ -540,15 +496,15 @@ function import_server (bus, options)
             if (client_bus_func && !master.options.__secure) {
 
                 // A connection
-                client('connection/*').to_fetch = function (key, star) {
-                    var result = bus.clone(master.fetch(key))
+                client('connection/*').to_get = function (key, star) {
+                    var result = bus.clone(master.get(key))
                     if (master.options.connections.include_users && result.user)
-                        result.user = client.fetch(result.user.key)
+                        result.user = client.get(result.user.key)
                     result.id     = star
                     result.client = star  // Deprecated.  Delete this line in v7.
                     return result
                 }
-                client('connection/*').to_save = function (o, star, t) {
+                client('connection/*').to_set = function (o, star, t) {
                     // Check permissions before editing
                     if (star !== conn.id && !master.options.connections.edit_others) {
                         t.abort()
@@ -556,32 +512,32 @@ function import_server (bus, options)
                     }
                     o.id     = star
                     o.client = star      // Deprecated.  Delete this line in v7.
-                    master.save(client.clone(o))
+                    master.set(client.clone(o))
                 }
 
                 // Your connection
-                client('connection').to_fetch = function () {
+                client('connection').to_get = function () {
                     // subscribe to changes in authentication
-                    client.fetch('current_user')
+                    client.get('current_user')
 
-                    var result = client.clone(client.fetch('connection/' + conn.id))
+                    var result = client.clone(client.get('connection/' + conn.id))
                     delete result.key
                     return result
                 }
-                client('connection').to_save = function (o) {
+                client('connection').to_set = function (o) {
                     o = client.clone(o)
                     o.key = 'connection/' + conn.id
-                    client.save(o)
+                    client.set(o)
                 }
 
                 // All connections
-                client('connections').to_save = function noop (t) {t.abort()}
-                client('connections').to_fetch = function () {
+                client('connections').to_set = function noop (t) {t.abort()}
+                client('connections').to_get = function () {
                     var result = []
-                    var conns = master.fetch('connections')
+                    var conns = master.get('connections')
                     for (var connid in conns)
                         if (connid !== 'key')
-                            result.push(client.fetch('connection/' + connid))
+                            result.push(client.get('connection/' + connid))
                     
                     return {all: result}
                 }
@@ -607,14 +563,6 @@ function import_server (bus, options)
                            + Math.random().toString(36).substring(2))}
     },
 
-    // Deprecated
-    ws_client: function (prefix, url, account) {
-        console.error('ws_client() is deprecated; use net_mount() instead')
-        bus.net_mount(prefix, url, account) },
-    // Deprecated
-    universal_ws_client: function () {
-        console.error('calling universal_ws_client is deprecated and no longer necessary') },
-
     file_store: (function () {
         // Make a database
         var fs = require('fs')
@@ -633,9 +581,9 @@ function import_server (bus, options)
                     (fs.writeFileSync(filename, '{}'), bus.log('Made a new db file'))
                 db = JSON.parse(fs.readFileSync(filename))
                 db_is_ok = true
-                // If we save before anything else is connected, we'll get this
+                // If we set before anything else is connected, we'll get this
                 // into the cache but not affect anything else
-                bus.save.fire(global.pointerify ? inline_pointers(db) : db)
+                bus.set.fire(global.pointerify ? inline_pointers(db) : db)
                 bus.log('Read db')
             } catch (e) {
                 console.error(e)
@@ -646,7 +594,7 @@ function import_server (bus, options)
             function save_db() {
                 if (!db_is_ok) return
 
-                console.time('saved db')
+                // console.time('saved db')
 
                 fs.writeFile(filename+'.tmp', JSON.stringify(db, null, 1), function(err) {
                     if (err) {
@@ -658,7 +606,7 @@ function import_server (bus, options)
                                 console.error('Crap !! DB IS DYING !!!!', err)
                                 db_is_ok = false
                             } else {
-                                console.timeEnd('saved db')
+                                // console.timeEnd('saved db')
                                 pending_save = null
                             }
                         })
@@ -689,12 +637,12 @@ function import_server (bus, options)
                     else return o
                 })
             }
-            function on_save (obj) {
+            function on_set (obj) {
                 db[obj.key] = global.pointerify ? abstract_pointers(obj) : obj
                 if (active) save_later()
             }
-            on_save.priority = true
-            bus(prefix).on_save = on_save
+            on_set.priority = true
+            bus(prefix).on_set = on_set
             bus(prefix).to_delete = function (key) {
                 delete db[key]
                 if (active) save_later()
@@ -761,17 +709,17 @@ function import_server (bus, options)
             return decodeURIComponent(k.replace('%2E', '.'))
         }
 
-        bus(prefix).to_fetch = function (key, t) {
+        bus(prefix).to_get = function (key, t) {
             firebase_ref.child(encode_firebase_key(key)).on('value', function (x) {
                 t.done(x.val() || {})
             }, function (err) { t.abort() })
         }
 
-        bus(prefix).on_save = function (o) {
+        bus(prefix).on_set = function (o) {
             firebase_ref.child(encode_firebase_key(o.key)).set(o)
         }
 
-        // bus(prefix).to_save = function (o, t) {
+        // bus(prefix).to_set = function (o, t) {
         //     firebase_ref.child(encode_firebase_key(o.key)).set(o, (err) => {
         //         err ? t.abort() : t.done()
         //     })
@@ -788,7 +736,7 @@ function import_server (bus, options)
         }
     },
 
-    db_fetch: function db_fetch (key) {/* does nothing unless overridden */},
+    db_get: function db_get (key) {/* does nothing unless overridden */},
     lazy_sqlite_store: function lazy_sqlite_store (opts) {
         if (!opts) opts = {}
         opts.lazy = true
@@ -840,7 +788,7 @@ function import_server (bus, options)
                         if (options.dont_fire)
                             bus.cache[key] = temp_db[key]
                         else
-                            bus.save.fire(temp_db[key])
+                            bus.set.fire(temp_db[key])
                         temp_db[key] = undefined
                     }
             }
@@ -858,10 +806,10 @@ function import_server (bus, options)
             return x ? JSON.parse(x.obj) : {}
         }
         if (opts.lazy) {
-            var db_fetched_keys = {}
-            bus.db_fetch = bus.reactive(function (key) {
-                if (db_fetched_keys[key]) return
-                db_fetched_keys[key] = true
+            var db_getted_keys = {}
+            bus.db_get = bus.reactive(function (key) {
+                if (db_getted_keys[key]) return
+                db_getted_keys[key] = true
 
                 // Get it from the database
                 var obj = sqlite_get(key)
@@ -875,12 +823,12 @@ function import_server (bus, options)
                                                 : o))
 
                 // Publish this to the bus
-                bus.save.fire(obj, {to_fetch: true})
+                bus.set.fire(obj, {to_get: true})
             })
         }
 
-        // Add save handlers
-        function on_save (obj) {
+        // Add set handlers
+        function on_set (obj) {
             if (opts.inline_pointers)
                 obj = abstract_pointers(obj)
 
@@ -901,14 +849,14 @@ function import_server (bus, options)
                 })
             }
         }
-        if (opts.save_sync) {
+        if (opts.set_sync) {
             var old_route = bus.route
             bus.route = function (key, method, arg, t) {
-                if (method === 'to_save') on_save(arg)
+                if (method === 'to_set') on_set(arg)
                 return old_route(key, method, arg, t)
             }
         } else
-            bus(prefix).on_set_sync = on_save
+            bus(prefix).on_set_sync = on_set
 
         bus(prefix).to_delete = function (key) {
             if (opts.use_transactions && !open_transaction){
@@ -985,12 +933,12 @@ function import_server (bus, options)
         try {
             var db = new require('pg-native')()
             bus.pg_db = db
-            bus.pg_save = pg_save
+            bus.pg_set = pg_set
             db.connectSync(opts.url)
             db.querySync('create table if not exists store (key text primary key, value jsonb)')
 
             var rows = db.querySync('select * from store')
-            rows.forEach(r => bus.save(inline_pointers(r.value, bus)))
+            rows.forEach(r => bus.set(inline_pointers(r.value, bus)))
 
             bus.log('Read ' + opts.url)
         } catch (e) {
@@ -998,16 +946,16 @@ function import_server (bus, options)
             console.error('Bad pg db')
         }
 
-        // Add save handlers
-        function pg_save (obj) {
+        // Add set handlers
+        function pg_set (obj) {
             obj = abstract_pointers(obj)
 
             db.querySync('insert into store (key, value) values ($1, $2) '
                          + 'on conflict (key) do update set value = $2',
                          [obj.key, JSON.stringify(obj)])
         }
-        pg_save.priority = true
-        bus(opts.prefix).on_save = pg_save
+        pg_set.priority = true
+        bus(opts.prefix).on_set = pg_set
         bus(opts.prefix).to_delete = function (key) {
             db.query('delete from store where key = $1', [key])
         }
@@ -1068,8 +1016,8 @@ function import_server (bus, options)
         bus.usage_log_nots = nots
 
         // Aggregate all accesses by day, to get daily active users
-        bus('usage').to_fetch = () => {
-            bus.fetch('time/' + refresh_interval)
+        bus('usage').to_get = () => {
+            bus.get('time/' + refresh_interval)
             var days = []
             var last_day
             for (var row of db.prepare('select * from usage where '
@@ -1107,8 +1055,8 @@ function import_server (bus, options)
             return {_: days}
         }
 
-        bus('recent_hits/*').to_fetch = (rest) => {
-            bus.fetch('time/' + refresh_interval)
+        bus('recent_hits/*').to_get = (rest) => {
+            bus.get('time/' + refresh_interval)
             var result = []
             for (var row of db.prepare('select * from usage where '
                                        + nots + ' order by date desc limit ?').iterate(
@@ -1123,8 +1071,8 @@ function import_server (bus, options)
             return {_: result}
         }
 
-        bus('recent_referers/*').to_fetch = (rest) => {
-            bus.fetch('time/' + refresh_interval)
+        bus('recent_referers/*').to_get = (rest) => {
+            bus.get('time/' + refresh_interval)
             var result = []
             for (var row of db.prepare('select * from usage where '
                                        + nots + ' order by date desc limit ?').iterate(
@@ -1172,7 +1120,7 @@ function import_server (bus, options)
             return times
         }
 
-        bus('socket_load_times').to_fetch = () => {
+        bus('socket_load_times').to_get = () => {
             return {_: sock_open_times()}
         }
     },
@@ -1183,26 +1131,26 @@ function import_server (bus, options)
                   JSON.stringify(details)])
     },
 
-    serve_time () {
-        if (bus('time*').to_fetch.length > 0)
+    time () {
+        if (bus('time*').to_get.length > 0)
             // Then it's already installed
             return
 
         // Time ticker
         var timeouts = {}
-        bus('time*').to_fetch =
-            function (key, rest, t) {
+        bus('time*', {
+            to_get: (key, rest, t) => {
                 if (key === 'time') rest = '/1000'
                 timeout = parseInt(rest.substr(1))
-                function f () { bus.save.fire({key: key, time: Date.now()}) }
+                function f () { bus.set.fire({key: key, val: Date.now()}) }
                 timeouts[key] = setInterval(f, timeout)
                 f()
-            }
-        bus('time*').to_forget =
-            function (key, rest) {
+            },
+            to_forget: (key, rest) => {
                 if (key === 'time') key = 'time/1000'
                 clearTimeout(timeouts[key])
             }
+        })
     },
 
     smtp (opts) {
@@ -1252,7 +1200,7 @@ function import_server (bus, options)
                     }
                 }
 
-                bus.save(email)
+                bus.set(email)
             })
         }
     },
@@ -1269,8 +1217,8 @@ function import_server (bus, options)
         //  - Is there security hole if users have a ? or a / in their name?
         //  - Make the master.posts/ state not require /
         //  - Make standard url tools for optional slashes, and ? query params
-        //  - Should a e.g. client to_save abort if it calls save that aborts?
-        //    - e.g. if master('posts*').to_save aborts
+        //  - Should a e.g. client to_set abort if it calls set that aborts?
+        //    - e.g. if master('posts*').to_set aborts
 
         // Helpers
         function get_posts (args) {
@@ -1325,15 +1273,15 @@ function import_server (bus, options)
         // }
 
         // Define state on master
-        if (master('posts_for/*').to_fetch.length === 0) {
+        if (master('posts_for/*').to_get.length === 0) {
             // Get posts for each user
-            master('posts_for/*').to_fetch = (json) => {
+            master('posts_for/*').to_get = (json) => {
                 watch_for_dirt('posts-for/' + json.for)
                 return {_: get_posts(json)}
             }
             // Saving any post will dirty the list for all users mentioned in
             // the post
-            master('post/*').to_save = (old, New, t) => {
+            master('post/*').to_set = (old, New, t) => {
                 // To do: diff the cc, to, and from lists, and only dirty
                 // posts_for people who have been changed
 
@@ -1362,38 +1310,38 @@ function import_server (bus, options)
             return u.name + '@' + opts.domain
         }
         function current_addy () {
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
             return c.logged_in ? user_addy(c.user) : 'public'
         }
         function is_author (post) {
             var from = post._.from
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
             return from.includes(current_addy())
         }
         function can_see (post) {
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
             var allowed = post._.to.concat(post._.cc).concat(post._.from)
             return allowed.includes(current_addy()) || allowed.includes('public')
         }
         var drtbus = master//require('./statebus')()
-        function dirty (key) { drtbus.save({key: 'dirty-'+key, n: Math.random()}) }
-        function watch_for_dirt (key) { drtbus.fetch('dirty-'+key) }
+        function dirty (key) { drtbus.set({key: 'dirty-'+key, n: Math.random()}) }
+        function watch_for_dirt (key) { drtbus.get('dirty-'+key) }
 
-        client('current_email').to_fetch = () => {
+        client('current_email').to_get = () => {
             return {_: current_addy()}
         }
 
         // Define state on client
-        client('posts*').to_fetch = (k, rest) => {
+        client('posts*').to_get = (k, rest) => {
             var args = bus.parse(rest.substr(1))
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
             args.for = current_addy()
-            var e = master.fetch('posts_for/' + JSON.stringify(args))
-            return {_: master.clone(e._).map(x=>client.fetch(x.key))}
+            var e = master.get('posts_for/' + JSON.stringify(args))
+            return {_: master.clone(e._).map(x=>client.get(x.key))}
         }
 
-        client('post/*').to_fetch = (k) => {
-            var e = master.clone(master.fetch(k))
+        client('post/*').to_get = (k) => {
+            var e = master.clone(master.get(k))
             if (!e._) return {}
             if (!can_see(e))
                 return {}
@@ -1404,7 +1352,7 @@ function import_server (bus, options)
             return e
         }
 
-        client('post/*').to_save = (o, t) => {
+        client('post/*').to_set = (o, t) => {
             if (!(client.validate(o, {key: 'string',
                                      _: {to: 'array',
                                          cc: 'array',
@@ -1422,7 +1370,7 @@ function import_server (bus, options)
                 return
             }
 
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
 
             // Make sure this user is an author
             var from = o._.from
@@ -1435,7 +1383,7 @@ function import_server (bus, options)
             o = client.clone(o)
             delete o.children
 
-            master.save(o)
+            master.set(o)
             t.done()
         }
 
@@ -1463,21 +1411,21 @@ function import_server (bus, options)
             t.done()
         }
 
-        client('friends').to_fetch = t => {
-            return {_: (master.fetch('users').all||[])
-                    .map(u=>client.fetch('email/' + user_addy(u)))
-                    .concat([client.fetch('email/public')])
+        client('friends').to_get = t => {
+            return {_: (master.get('users').all||[])
+                    .map(u=>client.get('email/' + user_addy(u)))
+                    .concat([client.get('email/public')])
             }
         }
 
-        client('email/*').to_fetch = (rest) => {
+        client('email/*').to_get = (rest) => {
             var m = rest.match(email_regex)
             var result = {address: rest}
             if (rest === 'public') {
                 result.name = 'public'
             }
             else if (m && m[5].toLowerCase() === opts.domain) {
-                result.user = client.fetch('user/' + m[1])
+                result.user = client.get('user/' + m[1])
                 result.name = result.user.name
                 result.pic = result.user.pic
                 result.upgraded = true
@@ -1492,14 +1440,14 @@ function import_server (bus, options)
     },
 
     sqlite_query_server: function sqlite_query_server (db) {
-        var fetch = bus.fetch
-        bus('table_columns/*').to_fetch =
-            function fetch_table_columns (key, rest) {
+        var get = bus.get
+        bus('table_columns/*').to_get =
+            function get_table_columns (key, rest) {
                 if (typeof key !== 'string')
                     console.log(handlers.hash)
                 var table_name = rest
-                var columns = fetch('sql/PRAGMA table_info(' + table_name + ')').rows.slice()
-                var foreign_keys = fetch('table_foreign_keys/' + table_name)
+                var columns = get('sql/PRAGMA table_info(' + table_name + ')').rows.slice()
+                var foreign_keys = get('table_foreign_keys/' + table_name)
                 var column_info = {}
                 for (var i=0;i< columns .length;i++) {
                     var col = columns[i].name
@@ -1516,10 +1464,10 @@ function import_server (bus, options)
             }
 
 
-        bus('table_foreign_keys/*').to_fetch =
+        bus('table_foreign_keys/*').to_get =
             function table_foreign_keys (key, rest) {
                 var table_name = rest
-                var foreign_keys = fetch('sql/PRAGMA foreign_key_list(' + table_name + ')').rows
+                var foreign_keys = get('sql/PRAGMA foreign_key_list(' + table_name + ')').rows
                 var result = {}
                 for (var i=0;i< foreign_keys .length;i++)
                     result[foreign_keys[i].from] = foreign_keys[i]
@@ -1528,26 +1476,26 @@ function import_server (bus, options)
                 return result
             }
 
-        bus('sql/*').to_fetch =
+        bus('sql/*').to_get =
             function sql (key, rest) {
-                fetch('time/60000')
+                get('time/60000')
                 var query = rest
                 try { query = JSON.parse(query) }
                 catch (e) { query = {stmt: query, args: []} }
                 
                 db.all(query.stmt, query.args,
                        function (err, rows) {
-                           if (rows) bus.save.fire({key:key, rows: rows})
+                           if (rows) bus.set.fire({key:key, rows: rows})
                            else console.error('Bad sqlite query', key, err)
                        }.bind(this))
             }
     },
 
     sqlite_table_server: function sqlite_table_server(db, table_name) {
-        var save = bus.save, fetch = bus.fetch
-        var table_columns = fetch('table_columns/'+table_name) // This will fail if used too soon
-        var foreign_keys  = fetch('table_foreign_keys/'+table_name)
-        var remapped_keys = fetch('remapped_keys')
+        var set = bus.set, get = bus.get
+        var table_columns = get('table_columns/'+table_name) // This will fail if used too soon
+        var foreign_keys  = get('table_foreign_keys/'+table_name)
+        var remapped_keys = get('remapped_keys')
         remapped_keys.keys = remapped_keys.keys || {}
         remapped_keys.revs = remapped_keys.revs || {}
         function row_json (row) {
@@ -1588,15 +1536,15 @@ function import_server (bus, options)
                 if (err) console.error('Problem with table!', table_name, err)
                 for (var i=0; i<rows.length; i++)
                     result[i] = row_json(rows[i])
-                bus.save.fire({key: table_name, rows: result})
+                bus.set.fire({key: table_name, rows: result})
             })
         }
         function render_row(obj) {
-            bus.save.fire(row_json(obj))
+            bus.set.fire(row_json(obj))
             if (remapped_keys.revs[obj.key]) {
                 var alias = bus.clone(obj)
                 alias.key = remapped_keys.revs[obj.key]
-                bus.save.fire(row_json(alias))
+                bus.set.fire(row_json(alias))
             }
         }
 
@@ -1604,8 +1552,8 @@ function import_server (bus, options)
         // Handlers!
         // ************************
 
-        // Fetching the whole table, or a single row
-        bus(table_name + '*').to_fetch = function (key, rest) {
+        // Getting the whole table, or a single row
+        bus(table_name + '*').to_get = function (key, rest) {
             if (rest === '')
                 // Return the whole table
                 return render_table()
@@ -1625,7 +1573,7 @@ function import_server (bus, options)
         }
 
         // Saving a row
-        bus(table_name + '/*').to_save = function (obj, rest) {
+        bus(table_name + '/*').to_set = function (obj, rest) {
             var columns = table_columns.columns
             var key = remapped_keys.keys[obj.key] || obj.key
 
@@ -1651,7 +1599,7 @@ function import_server (bus, options)
         }
 
         // Inserting a new row
-        bus('new/' + table_name + '/*').to_save = function (obj) {
+        bus('new/' + table_name + '/*').to_set = function (obj) {
             var columns = table_columns.columns
             var stmt = ('insert into ' + table_name + ' (' + columns.join(',')
                         + ') values (' + new Array(columns.length).join('?,') + '?)')
@@ -1664,7 +1612,7 @@ function import_server (bus, options)
                 console.log('insert complete, got id', this.lastID)
                 remapped_keys.keys[obj.key] = table_name + '/' + this.lastID
                 remapped_keys.revs[remapped_keys.keys[obj.key]] = obj.key
-                save(remapped_keys)
+                bus.set(remapped_keys)
                 render_table()
             })
         }
@@ -1694,29 +1642,29 @@ function import_server (bus, options)
         var client = this // to keep me straight while programming
 
         function logout (key) {
-            var clients = master.fetch('logged_in_clients')
+            var clients = master.get('logged_in_clients')
             for (var k in clients)
                 if (k !== 'key')
                     if (Object.keys(clients[k]).length === 0) {
                         client.log('Found a deleted user. Removing.', k, clients[k])
                         delete clients[k]
-                        master.save(clients)
+                        master.set(clients)
                     } else if (clients[k].key === key) {
                         client.log('Logging out!', k, clients[k])
                         delete clients[k]
-                        master.save(clients)
+                        master.set(clients)
                     }
         }
 
         // Initialize master
         if (!master.auth_initialized) {
-            master('users/passwords').to_fetch = function (k) {
-                master.log('users/passwords.to_fetch: Computing!')
+            master('users/passwords').to_get = function (k) {
+                master.log('users/passwords.to_get: Computing!')
                 var result = {key: 'users/passwords'}
-                var users = master.fetch('users')
+                var users = master.get('users')
                 users.all = users.all || []
                 for (var i=0; i<users.all.length; i++) {
-                    var u = master.fetch(users.all[i])
+                    var u = master.get(users.all[i])
                     if (!(u.login || u.name)) {
                         console.error('upass: this user has bogus name/login', u.key, u.name, u.login)
                         continue
@@ -1732,14 +1680,14 @@ function import_server (bus, options)
                 return result
             }
             master.auth_initialized = true
-            master.fetch('users/passwords')
+            master.get('users/passwords')
 
             master('user/*').to_delete = (key, t) => {
                 master.log('Deleteinggg!!!', key)
                 // Remove from users.all
-                var users = master.fetch('users')
+                var users = master.get('users')
                 users.all = users.all.filter(u => u.key && u.key !== key)
-                master.save(users)
+                master.set(users)
 
                 // Log out
                 master.log('Logging out', key)
@@ -1747,14 +1695,14 @@ function import_server (bus, options)
 
                 // Remove connection
                 master.log('Removing connections for', key)
-                var conns = master.fetch('connections')
+                var conns = master.get('connections')
                 for (var k in conns) {
                     console.log('Trying key', k)
                     if (k !== 'key')
                         if (conns[k].user && !conns[k].user.key) {
                             console.log('Cleaning keyless user', conss[k].user)
                             delete conns[k].user
-                            master.save(conns)
+                            master.set(conns)
                             continue
                         }
                 }
@@ -1769,9 +1717,9 @@ function import_server (bus, options)
 
         // Authentication functions
         function authenticate (login, pass) {
-            var userpass = master.fetch('users/passwords')[login.toLowerCase()]
+            var userpass = master.get('users/passwords')[login.toLowerCase()]
             master.log('authenticate: we see', {
-                passwords: master.fetch('users/passwords'),
+                passwords: master.get('users/passwords'),
                 hash_to_match: userpass && userpass.pass,
                 password_guess: pass
             })
@@ -1782,7 +1730,7 @@ function import_server (bus, options)
 
             // console.log('comparing passwords', pass, userpass.pass)
             if (require('bcrypt-nodejs').compareSync(pass, userpass.pass))
-                return master.fetch(userpass.user)
+                return master.get(userpass.user)
         }
         function create_account (params) {
             if (typeof (params.login || params.name) !== 'string')
@@ -1794,7 +1742,7 @@ function import_server (bus, options)
                                           '?key': undefined, '*': '*'}))
                 throw 'invalid name, login, pass, or email'
 
-            var passes = master.fetch('users/passwords')
+            var passes = master.get('users/passwords')
             if (passes.hasOwnProperty(login))
                 throw 'there is already a user with that login or name'
 
@@ -1804,7 +1752,7 @@ function import_server (bus, options)
             // Choose account key
             //
             //   NOTE: Checking if master.cache has the key probably sucks,
-            //   because if something fetches that key (hoping it exists), it
+            //   because if something gets that key (hoping it exists), it
             //   might create it, even though the account hasn't been created
             //   yet, and then this will rename it to some random ID.
             //
@@ -1821,31 +1769,31 @@ function import_server (bus, options)
                                pass: params.pass,
                                email: params.email }
             for (var k in new_account) if (!new_account[k]) delete new_account[k]
-            master.save(new_account)
+            master.set(new_account)
 
-            var users = master.fetch('users')
+            var users = master.get('users')
             users.all = users.all || []
             users.all.push(new_account)
             passes[login] = {user: new_account.key, pass: new_account.pass}
-            master.save(users)
-            master.save(passes)
+            master.set(users)
+            master.set(passes)
         }
 
         // Current User
-        client('current_user').to_fetch = function (k) {
-            client.log('* fetching: current_user')
+        client('current_user').to_get = function (k) {
+            client.log('* getting: current_user')
             if (!conn.client) return
-            var u = master.fetch('logged_in_clients')[conn.client]
+            var u = master.get('logged_in_clients')[conn.client]
             u = u && user_obj(u.key, true)
             return {user: u || null, logged_in: !!u}
         }
 
-        client('current_user').to_save = function (o, t) {
+        client('current_user').to_set = function (o, t) {
             function error (msg) {
-                client.save.abort(o)
-                var c = client.fetch('current_user')
+                client.set.abort(o)
+                var c = client.get('current_user')
                 c.error = msg
-                client.save.fire(c)
+                client.set.fire(c)
             }
 
             client.log('* saving: current_user!')
@@ -1856,9 +1804,9 @@ function import_server (bus, options)
                 client.client_ip = conn.remoteAddress
 
                 if (conn.id) {
-                    var connections = master.fetch('connections')
-                    connections[conn.id].user = master.fetch('logged_in_clients')[conn.client]
-                    master.save(connections)
+                    var connections = master.get('connections')
+                    connections[conn.id].user = master.get('logged_in_clients')[conn.client]
+                    master.set(connections)
                 }
             }
             else {
@@ -1867,9 +1815,9 @@ function import_server (bus, options)
                     try {
                         create_account(o.create_account)
                         client.log('Success creating account!')
-                        var cu = client.fetch('current_user')
+                        var cu = client.get('current_user')
                         cu.create_account = null
-                        client.save.fire(cu)
+                        client.set.fire(cu)
                     } catch (e) {
                         error('Cannot create that account because ' + e)
                         return
@@ -1891,14 +1839,14 @@ function import_server (bus, options)
                             // Associate this user with this session
                             // user.log('Logging the user in!', u)
 
-                            var clients     = master.fetch('logged_in_clients')
-                            var connections = master.fetch('connections')
+                            var clients     = master.get('logged_in_clients')
+                            var connections = master.get('connections')
 
                             clients[conn.client]      = u
                             connections[conn.id].user = u
 
-                            master.save(clients)
-                            master.save(connections)
+                            master.set(clients)
+                            master.set(connections)
 
                             client.log('current_user: success logging in!')
                         }
@@ -1915,18 +1863,18 @@ function import_server (bus, options)
 
                 else if (o.logout && conn.id) {
                     client.log('current_user: logging out')
-                    var clients = master.fetch('logged_in_clients')
-                    var connections = master.fetch('connections')
+                    var clients = master.get('logged_in_clients')
+                    var connections = master.get('connections')
 
                     delete clients[conn.client]
                     connections[conn.id].user = null
 
-                    master.save(clients)
-                    master.save(connections)
+                    master.set(clients)
+                    master.set(connections)
                 }
             }
 
-            t.refetch()
+            t.reget()
         }
         client('current_user').to_delete = function () {}
 
@@ -1935,8 +1883,8 @@ function import_server (bus, options)
         var private_closet_space_key = /^user\/[^\/]+\/private.*/
 
         // User
-        client('user/*').to_save = function (o, t) {
-            var c = client.fetch('current_user')
+        client('user/*').to_set = function (o, t) {
+            var c = client.get('current_user')
             var user_key = o.key.match(/^user\/([^\/]+)/)
             user_key = user_key && ('user/' + user_key[1])
 
@@ -1945,14 +1893,14 @@ function import_server (bus, options)
                 client.log('Only the current user can touch themself.',
                            {logged_in: c.logged_in, as: c.user && c.user.key,
                             touching: user_key})
-                client.save.abort(o)
+                client.set.abort(o)
                 return
             }
 
             // Users have closet space at /user/<name>/*
             if (o.key.match(closet_space_key)) {
                 client.log('saving closet data')
-                master.save(o, t)
+                master.set(o, t)
                 return
             }
 
@@ -1964,7 +1912,7 @@ function import_server (bus, options)
                                      '?pass': 'string', '?email': 'string', /*'?pic': 'string',*/
                                      '*':'*'})) {
                 client.log('This user change fails validation.')
-                client.save.abort(o)
+                client.set.abort(o)
                 return
             }
 
@@ -1976,23 +1924,23 @@ function import_server (bus, options)
             var login = o.login || o.name
             if (!login) {
                 client.log('User must have a login or a name')
-                client.save.abort(o)
+                client.set.abort(o)
                 return
             }
 
-            var u = master.fetch(o.key)
-            var userpass = master.fetch('users/passwords')
+            var u = master.get(o.key)
+            var userpass = master.get('users/passwords')
 
             // Validate that the login/name is not changed to something clobberish
             var old_login = u.login || u.name
             if (old_login.toLowerCase() !== login.toLowerCase()
                 && userpass.hasOwnProperty(login)) {
                 client.log('The login', login, 'is already taken. Aborting.')
-                client.save.abort(o)         // Abort
+                client.set.abort(o)         // Abort
 
-                o = client.fetch(o.key)      // Add error message
+                o = client.get(o.key)      // Add error message
                 o.error = 'The login "' + login + '" is already taken'
-                client.save.fire(o)
+                client.set.fire(o)
 
                 return                       // And exit
             }
@@ -2029,11 +1977,11 @@ function import_server (bus, options)
                 if (!protected.hasOwnProperty(k) && !o.hasOwnProperty(k))
                     delete u[k]
 
-            master.save(u)
+            master.set(u)
         }
-        client('user/*').to_fetch = function user_fetcher (k) {
-            var c = client.fetch('current_user')
-            client.log('* fetching:', k, 'as', c.user)
+        client('user/*').to_get = function user_getter (k) {
+            var c = client.get('current_user')
+            client.log('* getting:', k, 'as', c.user)
 
             // Users have closet space at /user/<name>/*
             if (k.match(closet_space_key)) {
@@ -2043,8 +1991,8 @@ function import_server (bus, options)
                     client.log('hiding private closet data')
                     return {}
                 }
-                client.log('fetching closet data')
-                return client.clone(master.fetch(k))
+                client.log('getting closet data')
+                return client.clone(master.get(k))
             }
 
             // Otherwise return the actual user
@@ -2052,7 +2000,7 @@ function import_server (bus, options)
         }
         client('user/*').to_delete = function () {}
         function user_obj (k, logged_in) {
-            var o = master.clone(master.fetch(k))
+            var o = master.clone(master.get(k))
             if (k.match(/^user\/([^\/]+)\/private\/(.*)$/))
                 return logged_in ? o : {key: k}
             
@@ -2064,8 +2012,8 @@ function import_server (bus, options)
         // Blacklist sensitive stuff on master, in case we have a shadow set up
         var blacklist = 'users users/passwords logged_in_clients'.split(' ')
         for (var i=0; i<blacklist.length; i++) {
-            client(blacklist[i]).to_fetch  = function () {}
-            client(blacklist[i]).to_save   = function () {}
+            client(blacklist[i]).to_get  = function () {}
+            client(blacklist[i]).to_set   = function () {}
             client(blacklist[i]).to_delete = function () {}
             client(blacklist[i]).to_forget = function () {}
         }
@@ -2085,24 +2033,24 @@ function import_server (bus, options)
             var old_prefix = 'client/' + client.client_id
             var new_prefix = 'client/' + user.key.substr('user/'.length)
 
-            var keys = client.master.fetch('persisted_keys/' + client.client_id)
+            var keys = client.master.get('persisted_keys/' + client.client_id)
             if (!keys.val) return
             for (var old_key in keys.val) {
                 var new_key = new_prefix + old_key.substr(old_prefix.length)
-                var o = client.clone(client.master.fetch(old_key))
+                var o = client.clone(client.master.get(old_key))
                 // Delete the old
                 client.master.del(old_key)
 
-                var new_o = client.master.fetch(new_key)
+                var new_o = client.master.get(new_key)
                 // If the new key doesn't clobber any existing data on the user...
                 if (Object.keys(new_o).length === 1) {
-                    // Save the new
+                    // Set the new
                     o.key = new_key
-                    client.master.save(o)
+                    client.master.set(o)
                 }
             }
             keys.val = {}
-            client.master.save(keys)
+            client.master.set(keys)
 
             // var cache = client.master.cache
 
@@ -2117,9 +2065,9 @@ function import_server (bus, options)
             //         client.master.del(old_key)
 
             //         if (!(cache.hasOwnProperty(new_key))) {
-            //             // Save the new
+            //             // Set the new
             //             o.key = new_key
-            //             client.master.save(o)
+            //             client.master.set(o)
             //         }
             //     }
             // }
@@ -2127,7 +2075,7 @@ function import_server (bus, options)
 
         // Copy client to user if we log in
         client(_=>{
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
             if (client.loading()) return
             if (was_logged_in == false && c.logged_in)
                 // User just logged in!  Let's copy his stuff over
@@ -2135,13 +2083,13 @@ function import_server (bus, options)
             was_logged_in = c.logged_in
         })
 
-        client(prefix_to_sync).to_fetch = function (key) {
-            var c = client.fetch('current_user')
+        client(prefix_to_sync).to_get = function (key) {
+            var c = client.get('current_user')
             if (client.loading()) return
             var prefix = client_prefix(c)
 
             // Get the state from master
-            var obj = client.clone(client.master.fetch(prefix + key))
+            var obj = client.clone(client.master.get(prefix + key))
 
             // Translate it back to client
             obj = client.deep_map(obj, function (o) {
@@ -2152,14 +2100,14 @@ function import_server (bus, options)
             return obj
         }
 
-        client(prefix_to_sync).to_save = function (obj) {
+        client(prefix_to_sync).to_set = function (obj) {
             if (validate && !validate(obj)) {
                 console.warn('Validation failed on', obj)
-                client.save.abort(obj)
+                client.set.abort(obj)
                 return
             }
 
-            var c = client.fetch('current_user')
+            var c = client.get('current_user')
             if (client.loading()) return
             var prefix = client_prefix(c)
 
@@ -2175,23 +2123,23 @@ function import_server (bus, options)
                 return o
             })
 
-            // Save to master
-            client.master.save(obj)
-            p_keys && client.master.save(p_keys)
+            // Set to master
+            client.master.set(obj)
+            p_keys && client.master.set(p_keys)
         }
 
         client(prefix_to_sync).to_delete = function (k) {
-            k = client_prefix(client.fetch('current_user')) + k
+            k = client_prefix(client.get('current_user')) + k
             client.master.delete(k)
 
             var p_keys = client_persisted_keys()
             delete p_keys.val[k]
-            client.master.save(p_keys)
+            client.master.set(p_keys)
         }
 
         function client_persisted_keys () {
-            if (client.fetch('current_user').logged_in) return
-            var result = client.master.fetch('persisted_keys/' + client.client_id)
+            if (client.get('current_user').logged_in) return
+            var result = client.master.get('persisted_keys/' + client.client_id)
             if (result && !result.val) result.val = {}
             return result
         }
@@ -2206,17 +2154,17 @@ function import_server (bus, options)
             // to the global cache
             if (count === 0) {
                 count++
-                if (method === 'to_fetch')
+                if (method === 'to_get')
                     bus.run_handler(function get_from_master (k) {
-                        // console.log('DEFAULT FETCHing', k)
-                        var r = master_bus.fetch(k)
-                        // console.log('DEFAULT FETCHed', r)
-                        bus.save.fire(r, {version: master_bus.versions[r.key]})
+                        // console.log('DEFAULT GETting', k)
+                        var r = master_bus.get(k)
+                        // console.log('DEFAULT GETted', r)
+                        bus.set.fire(r, {version: master_bus.versions[r.key]})
                         }, method, arg)
-                else if (method === 'to_save')
-                    bus.run_handler(function save_to_master (o, t) {
+                else if (method === 'to_set')
+                    bus.run_handler(function set_to_master (o, t) {
                         // console.log('DEFAULT ROUTE', t)
-                        master_bus.save(bus.clone(o), t)
+                        master_bus.set(bus.clone(o), t)
                     }, method, arg, {t: t})
                 else if (method == 'to_delete')
                     bus.run_handler(function delete_from_master (k, t) {
@@ -2283,7 +2231,7 @@ function import_server (bus, options)
         var buffer = {}
         var full_file_path = require('path').join(__dirname, file_path)
 
-        bus(state_path + '*').to_fetch = (rest) => {
+        bus(state_path + '*').to_get = (rest) => {
             // We DO want to handle:
             //   - "foo"
             //   - "foo/*"
@@ -2309,7 +2257,7 @@ function import_server (bus, options)
             return {_:f}
         }
 
-        bus(state_path + '/*').to_save = (o, rest, t) => {
+        bus(state_path + '/*').to_set = (o, rest, t) => {
             if (rest.length>0 && rest[0] !== '/') return
             var f = Buffer.from(o._, 'base64')
             require('fs').writeFile(file_path + rest, f,
@@ -2320,15 +2268,15 @@ function import_server (bus, options)
         bus.http.use('/'+state_path, require('express').static(full_file_path))
     },
 
-    // Installs a GET handler at route that gets state from a fetcher function
+    // Installs a GET handler at route that gets state from a getter function
     // Note: Makes too many textbusses.  Should re-use one.
-    http_serve: function http_serve (route, fetcher) {
+    http_serve: function http_serve (route, getter) {
         var textbus = require('./statebus')()
         textbus.label = 'textbus'
         var watched = new Set()
-        textbus('*').to_fetch = (filename, old) => {
+        textbus('*').to_get = (filename, old) => {
             return {etag: Math.random() + '',
-                    _: fetcher(filename)}
+                    _: getter(filename)}
         }
         bus.http.get(route, (req, res) => {
             var path = req.path
@@ -2338,8 +2286,8 @@ function import_server (bus, options)
                 return
             }
 
-            textbus.fetch(req.path) // So that textbus never clears the cache
-            textbus.fetch(req.path, function cb (o) {
+            textbus.get(req.path) // So that textbus never clears the cache
+            textbus.get(req.path, function cb (o) {
                 res.setHeader('Cache-Control', 'public')
                 // res.setHeader('Cache-Control', 'public, max-age='
                 //               + (60 * 60 * 24 * 30))  // 1 month
@@ -2394,16 +2342,15 @@ function import_server (bus, options)
             var files =
                 ['extras/coffee.js', 'extras/sockjs.js', 'extras/react.js',
                  'statebus.js', 'client.js'].map((f) => fs.readFileSync('node_modules/statebus/' + f))
-            if (bus.options.braid_mode)
-                files.unshift(fs.readFileSync(
-                    'node_modules/braidify/braidify-client.js'
-                ))
+            files.unshift(fs.readFileSync(
+                'node_modules/braidify/braidify-client.js'
+            ))
             res.send(files.join(';\n'))
         })
     },
 
     serve_wiki: () => {
-        bus('edit/*').to_fetch = () => ({_: require('./extras/wiki.coffee').code})
+        bus('edit/*').to_get = () => ({_: require('./extras/wiki.coffee').code})
     },
 
     unix_socket_repl: function (filename) {
@@ -2470,13 +2417,15 @@ function import_server (bus, options)
     }
 }
     // Add methods to bus object
-    for (var m in extra_methods)
+    for (var m in extra_methods) {
         bus[m] = extra_methods[m]
+        bus.libs[m] = extra_methods[m]
+    }
 
     bus.options = default_options(bus)
     set_options(bus, options)
 
-    // Automatically make state:// fetch over a websocket
+    // Automatically make state:// get over a websocket
     bus.net_automount()
     return bus
 }
@@ -2484,8 +2433,6 @@ function import_server (bus, options)
 
 // Disables CORS in HTTP servers
 function free_the_cors (req, res, next) {
-    console.log('free the cors!', req.method, req.url)
-
     var free_the_cors = {
         "Access-Control-Allow-Origin": "*",
         "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
@@ -2496,7 +2443,7 @@ function free_the_cors (req, res, next) {
         res.writeHead(200)
         res.end()
     } else
-        next()
+        next && next()
 }
 
 
@@ -2537,6 +2484,11 @@ delay.init = _=> delay_so_far = 0
 var delay_so_far = 0
 
 
+// Set up default linked json converters
+var to_http_body = (o) => JSON.stringify(o.val)
+var from_http_body = (key, body) => ({ key, val: JSON.parse(body) })
+
+
 // Now export everything
 module.exports.import_server = import_server
 module.exports.run_server = function (bus, options) { bus.serve(options) }
@@ -2545,7 +2497,7 @@ module.exports.import_module = function (statebus) {
 
     statebus.serve = function serve (options) {
         var bus = statebus()
-        require('./server').run_server(bus, options)
+        require('./servers').run_server(bus, options)
         return bus
     }