statebus 6.1.32 → 6.2.1

package/client.js

@@ -59,6 +59,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 +555,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.1.32",
+  "version": "6.2.1",
   "description": "Synchronize state.",
   "main": "statebus.js",
   "scripts": {
@@ -17,11 +17,12 @@
   "repository": "invisible-college/statebus",
   "dependencies": {
     "bcrypt-nodejs": "0.0.3",
-    "braidify": "^0.1.18",
-    "chokidar": "^3.4.0",
+    "braid-http": "^1.3.82",
+    "chokidar": "^4.0.3",
     "coffeescript": "^2.3.1",
     "cookie": "^0.3.1",
-    "express": "^4.15.3",
+    "express": "^4.21.2",
+    "http2-express-bridge": "^1.0.7",
     "sockjs": "^0.3.18",
     "websocket": "^1.0.24"
   }

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
 }
@@ -22,7 +22,8 @@ function default_options (bus) { return {
             certificate_bundle: 'certs/certificate-bundle'},
     connections: {include_users: true, edit_others: true},
     websocket_path: '_connect_to_statebus_',
-    __secure: false
+    __secure: false,
+    use_http2: true
 }}
 
 function set_options (bus, options) {
@@ -46,10 +47,10 @@ function set_options (bus, options) {
 function import_server (bus, options)
 {   var extra_methods = {
 
-    serve: function serve (options) {
+    serve: function serve (options={}) {
         var master = bus
-        bus.honk = options.honk ?? 'statelog'
         master.label = 'master'
+        bus.honk = options.honk ?? 'statelog'
 
         // Initialize Options
         set_options(bus, options)
@@ -59,6 +60,12 @@ function import_server (bus, options)
             || require('fs').existsSync(bus.options.certs.certificate)
             || require('fs').existsSync(bus.options.certs.certificate_bundle))
 
+        // Only allow H2 with SSL/TLS for now
+        if (bus.options.use_http2 && !use_ssl) {
+            console.log('HTTP/2 disabled because we have no TLS/SSL support.')
+            bus.options.use_http2 = false
+        }
+
         function c (client, conn) {
             client.honk = bus.honk
             client.serves_auth(conn, master)
@@ -71,17 +78,22 @@ function import_server (bus, options)
 
         // ******************************************
         // ***** Create our own http server *********
-        bus.make_http_server({port: bus.options.port, use_ssl})
+        bus.make_http_server({port: bus.options.port,
+                              use_ssl,
+                              use_http2: bus.options.use_http2})
         bus.sockjs_server(this.http_server, c) // Serve via sockjs on it
         var express = require('express')
-        bus.express = express()
+        if (bus.options.use_http2)
+            bus.express = require('http2-express-bridge')(express)
+        else
+            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')())
-              console.log('Enabled http compression!') } catch (e) {}
+        // // use gzip compression if available
+        // try { bus.http.use(require('compression')())
+        //       console.log('Enabled http compression!') } catch (e) {}
 
 
         // Initialize new clients with an id.  We put the client id on
@@ -167,7 +179,8 @@ function import_server (bus, options)
             bus.make_http_server({
                 port: bus.options.backdoor,
                 name: 'backdoor_http_server',
-                use_ssl: use_ssl
+                use_ssl: use_ssl,
+                use_http2: bus.options.use_http2
             })
             bus.sockjs_server(this.backdoor_http_server)
         }
@@ -206,7 +219,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!')
@@ -224,7 +240,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 {
@@ -262,10 +278,11 @@ function import_server (bus, options)
                 if (typeof req.headers['content-type'] !== 'string'
                     || req.headers['content-type'].toLowerCase() !== 'application/json')
                     console.error('Error: PUT content-type is not application/json')
-                var body = ''
-                req.on('data', chunk => {body += chunk.toString()})
+                var chunks = []
+                req.on('data', chunk => {chunks.push(chunk)})
                 req.on('end', () => {
                     try {
+                        var body = Buffer.concat(chunks).toString()
                         console.log('gonna parse', body)
                         var path = req.url.substr(1)
                         var obj = bus.from_http_body(path, body)
@@ -308,15 +325,7 @@ function import_server (bus, options)
         if (options.use_ssl) {
             // Load with TLS/SSL
             console.log('Encryption ON')
-
-            // use http2 compatible library if available
-            try {
-                var http = require('spdy')
-                console.log('Found spdy library. HTTP/2 enabled!')
-            } catch (e) {
-                var http = require('https')
-            }
-
+            var http1 = require('https')
             var protocol = 'https'
             var ssl_options = {
                 ca: (fs.existsSync(this.options.certs.certificate_bundle)
@@ -332,11 +341,26 @@ function import_server (bus, options)
         else {
             // Load unencrypted server
             console.log('Encryption OFF')
-            var http = require('http')
+            var http1 = require('http')
             var protocol = 'http'
             var ssl_options = undefined
         }
 
+        // Create the http server
+        var http_server
+        if (options.use_http2) {
+            console.log('Using HTTP/2')
+            // The HTTP2 way
+            http2 = require('http2')
+            http_server = http2[options.use_ssl ? 'createSecureServer' : 'createServer'](
+                {...ssl_options, allowHTTP1: true}
+            )
+        } else
+            // Or the HTTP1 way
+            http_server = http1.createServer(ssl_options)
+
+        // Choose the port to listen on
+        var port
         if (options.port === 'auto') {
             var bind = require('./extras/tcp-bind')
             function find_a_port () {
@@ -360,18 +384,16 @@ function import_server (bus, options)
                     bus.redirect_port_80()
                 } catch (e) {fd = find_a_port()}
             else fd = find_a_port()
-            var http_server = http.createServer(ssl_options)
-            http_server.listen({fd: fd}, () => {
-                console.log('Listening on '+protocol+'://<host>:'+bus.port)
-            })
-        }
-        else {
-            bus.port = bus.options.port
-            var http_server = http.createServer(ssl_options)
-            http_server.listen(bus.options.port, () => {
-                console.log('Listening on '+protocol+'://<host>:'+bus.port)
-            })
+
+            port = {fd: fd}
         }
+        else
+            port = bus.port = bus.options.port
+
+        // And start the server listening on the port!
+        http_server.listen(port, () => {
+            console.log('Listening on '+protocol+'://<host>:'+bus.port)
+        })
 
         bus[options.name || 'http_server'] = http_server
     },
@@ -2397,7 +2419,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'))
         })