statebus 6.1.17 → 6.1.21

package/client.js

@@ -1,5 +1,6 @@
 (function () {
-    var unique_sockjs_string = '_connect_to_statebus_'
+    var websocket_prefix = (clientjs_option('websocket_path')
+                            || '_connect_to_statebus_')
 
     window.dom = window.dom || new Proxy({}, {
         get: function (o, k) { return o[k] },
@@ -36,9 +37,9 @@
         //     link.href = url
         //     url = link.href
         // }
-        console.log('opening websocket to', url)
-        return new WebSocket(url + '/' + unique_sockjs_string + '/websocket')
-        // return new SockJS(url + '/' + unique_sockjs_string)
+
+        return new WebSocket(url + '/' + websocket_prefix + '/websocket')
+        // return new SockJS(url + '/' + websocket_prefix)
     }
     function client_creds (server_url) {
         var me = bus.fetch('ls/me')
@@ -97,9 +98,9 @@
                                 subscribe: true,
                                 headers: {accept: 'application/json'}
                             }
-                           ).andThen( x => {
+                           ).andThen( function (x) {
                                t.return({
-                                   key,
+                                   key: key,
                                    val: add_prefixes(JSON.parse(x.body))
                                })
                            })
@@ -452,11 +453,10 @@
         window.ignore_flashbacks = false
         if (statebus_server !== 'none') {
             if (clientjs_option('braid_mode')) {
-                console.log('We socket-free!')
+                console.log('Using Braid-HTTP!')
                 braid_http_mount ('/*', statebus_server)
             } else {
                 bus.net_mount ('/*', statebus_server)
-                console.log('We going websocket!')
             }
         }
 

package/package.json

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

package/server.js

@@ -1,6 +1,5 @@
 var fs = require('fs'),
     util = require('util')
-var unique_sockjs_string = '_connect_to_statebus_'
 
 // Import braidify if it's available
 try {
@@ -22,6 +21,7 @@ function default_options (bus) { return {
             certificate: 'certs/certificate',
             certificate_bundle: 'certs/certificate-bundle'},
     connections: {include_users: true, edit_others: true},
+    websocket_path: '_connect_to_statebus_',
     __secure: false
 }}
 
@@ -106,11 +106,6 @@ function import_server (bus, options)
                 bus.sync_files(x.state_path, x.fs_path)
         })
 
-        bus.express.use((req, res, next) => {
-            console.log('server.js:', req.method, req.url)
-            next()
-        })
-
         // Free the CORS for Braid requests!
         bus.express.use((req, res, next) => {
             // If this requests knows about Braid then we presume the
@@ -391,7 +386,8 @@ function import_server (bus, options)
         this.http_server.on('request',  // Install express
                             function (request, response) {
                                 // But express should ignore all sockjs requests
-                                if (!request.url.startsWith('/'+unique_sockjs_string+'/'))
+                                if (!request.url.startsWith(
+                                    '/' + bus.options.websocket_path + '/'))
                                     express_app(request, response)
                             })
 
@@ -591,7 +587,7 @@ function import_server (bus, options)
             }
         })
 
-        s.installHandlers(httpserver, {prefix:'/' + unique_sockjs_string})
+        s.installHandlers(httpserver, {prefix:'/' + bus.options.websocket_path})
     },
 
     make_websocket: function make_websocket (url) {
@@ -599,7 +595,7 @@ function import_server (bus, options)
         url = url.replace(/^istate:\/\//, 'ws://')
         url = url.replace(/^statei:\/\//, 'ws://')
         WebSocket = require('websocket').w3cwebsocket
-        return new WebSocket(url+'/'+unique_sockjs_string+'/websocket')
+        return new WebSocket(url+'/'+bus.options.websocket_path+'/websocket')
     },
     client_creds: function client_creds (server_url) {
         // Right now the server just creates a different random id each time

package/statebus.js

@@ -10,10 +10,12 @@
     // Fetch, Save, Forget, Delete
 
     function fetch (key, callback) {
+        if (typeof key !== 'string'
+            && !(typeof key === 'object' && typeof key.key === 'string'))
+            throw ('Error: fetch(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
-        if (typeof key !== 'string')
-            throw ('Error: fetch(key) called with a non-string key: '+key)
         bogus_check(key)
 
         var called_from_reactive_funk = !callback