statebus 6.2.0 → 6.2.2

package/client.js

@@ -14,7 +14,8 @@
     // ****************
     // Connecting over the Network
     function set_cookie (key, val) {
-        document.cookie = key + '=' + val + '; Expires=21 Oct 2025 00:0:00 GMT;'
+        // max-age is 400 days, the max allowed in chrome now
+        document.cookie = key + '=' + val + '; max-age=34560000;'
     }
     function get_cookie (key) {
         var c = document.cookie.match('(^|;)\\s*' + key + '\\s*=\\s*([^;]+)');
@@ -59,6 +60,8 @@
     }
 
     function braid_http_mount (prefix, url) {
+        throw "Sorry, braid_http_mount is disabled! Tell mike you're using it, and he'll re-enable it."
+
         var preprefix = prefix.slice(0,-1)
         var has_prefix = new RegExp('^' + preprefix)
         var is_absolute = /^https?:\/\//
@@ -553,12 +556,15 @@
         improve_react()
         window.ignore_flashbacks = false
         if (statebus_server !== 'none') {
-            if (clientjs_option('braid_mode')) {
-                console.log('Using Braid-HTTP!')
-                braid_http_mount ('/*', statebus_server)
-            } else {
+            // Disable "braid_mode" for now
+            if (clientjs_option('braid_mode'))
+                console.log('braid_mode is disabled for now.  Tell mike that you\'re using it, and he\'ll re-enable it!')
+            // if (clientjs_option('braid_mode')) {
+            //     console.log('Using Braid-HTTP!')
+            //     braid_http_mount ('/*', statebus_server)
+            // } else {
                 bus.net_mount ('/*', statebus_server)
-            }
+            // }
         }
 
         if (window.statebus_backdoor) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statebus",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "repository": "invisible-college/statebus",
   "dependencies": {
     "bcrypt-nodejs": "0.0.3",
-    "braidify": "^0.1.18",
+    "braid-http": "^1.3.82",
     "chokidar": "^4.0.3",
     "coffeescript": "^2.3.1",
     "cookie": "^0.3.1",

package/server.js

@@ -3,8 +3,8 @@ var fs = require('fs'),
 
 // Import braidify if it's available
 try {
-    var braidify = require('braidify').http_server
-    console.log('Found braidify library. Braid-HTTP enabled!')
+    var braidify = require('braid-http').http_server
+    console.log('Found braid-http library. Braid-HTTP enabled!')
 } catch (e) {
     var braidify = undefined
 }
@@ -106,8 +106,9 @@ function import_server (bus, options)
                                   + Math.random().toString(36).substring(2)
                                   + Math.random().toString(36).substring(2))
             
+                    // max-age is 400 days, the max allowed in chrome now
                     res.setHeader('Set-Cookie', 'client=' + req.client
-                                  + '; Expires=21 Oct 2025 00:0:00 GMT;')
+                                  + '; max-age=34560000;')
                 }
                 next()
             })
@@ -219,7 +220,10 @@ function import_server (bus, options)
                 res.end()
             }
 
-            braidify && braidify(req, res)
+            // Braidify the request
+            braidify && braidify(req, res); if (req.is_multiplexer) return
+
+            // Handle subscription
             if (req.subscribe) {
                 res.startSubscription({ onClose: end_it_all })
                 console.log('yay subscription!')
@@ -237,7 +241,7 @@ function import_server (bus, options)
                     // 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'})
+                    res.sendUpdate({body: body || 'null'})
 
                 // Or just return the current version
                 else {
@@ -2416,7 +2420,7 @@ function import_server (bus, options)
                  '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'
+                    'node_modules/braid-http/braid-http-client.js'
                 ))
             res.send(files.join(';\n'))
         })