statebus 7.0.6 → 7.0.9

package/client-library.js

@@ -661,7 +661,7 @@
             get: function (o, k) { return o[k] },
             set: function (o, k, v) {
                 o[k] = v
-                make_component(k, v)
+                window[k] = make_component(k, v)
                 return true
             }
         })
@@ -713,7 +713,7 @@
 
         // ... or at least most of them -- there are just a few missing from
         // this list.
-        var all_tags = 'a,abbr,address,area,article,aside,audio,b,base,bdi,bdo,blockquote,body,br,button,canvas,caption,cite,code,col,colgroup,data,datalist,dd,del,details,dfn,dialog,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,img,ins,kbd,label,legend,li,link,main,map,mark,menu,meta,meter,nav,noscript,object,ol,optgroup,option,output,p,param,picture,pre,progress,q,s,samp,script,section,select,slot,small,source,span,strong,style,sub,summary,sup,table,tbody,td,template,tfoot,th,thead,title,tr,u,ul,video,input'.split(',')
+        var all_tags = 'a,abbr,address,area,article,aside,audio,b,base,bdi,bdo,blockquote,br,button,canvas,caption,cite,code,col,colgroup,data,datalist,dd,del,details,dfn,dialog,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,img,ins,kbd,label,legend,li,link,main,map,mark,menu,meta,meter,nav,noscript,object,ol,optgroup,option,output,p,param,picture,pre,progress,q,s,samp,script,section,select,slot,small,source,span,strong,style,sub,summary,sup,svg,table,tbody,td,template,tfoot,th,thead,title,tr,u,ul,video,input,circle,ellipse,g,image,line,path,polygon,polyline,rect,switch,symbol,text,textPath,tspan,use'.split(',')
         all_tags.forEach((tagname) => {
             window[tagname.toUpperCase()] = function_for_tag(tagname)
         })
@@ -721,8 +721,8 @@
         // We create special functions for INPUT and TEXTAREA, because they
         // have to do extra work to maintain the cursor when we use statebus
         // instead of React's setState() for state updates.
-        window.INPUT    = function_for_tag(make_fixed_textbox('input'))
-        window.TEXTAREA = function_for_tag(make_fixed_textbox('textarea'))
+        window.INPUT    = function_for_tag(bus.libs.react17.input)
+        window.TEXTAREA = function_for_tag(bus.libs.react17.textarea)
 
 
         // Improve the functions ^^^ put this above
@@ -809,6 +809,12 @@
         })
     }
 
+    // We create special functions for INPUT and TEXTAREA, because they
+    // have to do extra work to maintain the cursor when we use statebus
+    // instead of React's setState() for state updates.
+    bus.libs.react17.input = make_fixed_textbox('input')
+    bus.libs.react17.textarea = make_fixed_textbox('textarea')
+
     function autodetect_args (func) {
         if (func.args) return
 
@@ -823,8 +829,7 @@
     var users_widgets = {}
     function make_component(name, func) {
         // Define the component
-
-        window[name] = users_widgets[name] = create_react_class({
+        return users_widgets[name] = create_react_class({
             displayName: name,
             render: function () {
                 var args = []

package/package.json

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

package/server-library.js

@@ -145,8 +145,11 @@ function import_server (bus, make_statebus, options)
         // 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.headers.peer || req.headers['put-order']
             || req.method === 'OPTIONS')
             free_the_cors(req, res)
+        if (req.method === 'OPTIONS')
+            return
 
         // Initialize new clients with an id.  We put the client id on
         // req.client, and also in a cookie for the browser to see.
@@ -258,7 +261,7 @@ function import_server (bus, make_statebus, options)
                     if (req.headers.peer) {
                         let peer = req.headers.peer,
                             key = obj.key
-                        var cb = cbus.http_callbacks[
+                        var cb = cbus.http_callbacks && cbus.http_callbacks[
                             JSON.stringify({peer, key})
                         ]
                         if (cb) cb.has_seen(cbus, key, t.version)
@@ -1691,6 +1694,11 @@ function import_server (bus, make_statebus, options)
     },
 
     serves_auth: function serves_auth (conn, master) {
+        // Right now, we only support accounts at '@username', but in general
+        // we could allow the prefix to be configurable.  We just have to go
+        // through this function and make all the regular expressions (like
+        // /@*.../) parameterizable.
+        var prefix = '@'
         var client = this // to keep me straight while programming
         function logout (user_key) {
             var clients = master.get('logged_in_clients')
@@ -1747,7 +1755,7 @@ function import_server (bus, make_statebus, options)
             master.auth_initialized = true
             master.get('users/passwords')
 
-            master('user/*').deleter = (key, t) => {
+            master(prefix + '*').deleter = (key, t) => {
                 master.log('Deleteinggg!!!', key)
                 // Remove from users.all
                 var users = master.get('users')
@@ -1820,11 +1828,11 @@ function import_server (bus, make_statebus, options)
             //   might create it, even though the account hasn't been created
             //   yet, and then this will rename it to some random ID.
             //
-            var key = 'user/' + params.name
+            var key = prefix + params.name
             if (!params.name)
-                key = 'user/' + Math.random().toString(36).substring(7,13)
+                key = prefix + Math.random().toString(36).substring(7,13)
             while (master.cache.hasOwnProperty(key))
-                key = 'user/' + Math.random().toString(36).substring(7,13)
+                key = prefix + Math.random().toString(36).substring(7,13)
 
             // Make account object
             var new_account = {
@@ -1964,15 +1972,15 @@ function import_server (bus, make_statebus, options)
         }
         client('current_user').deleter = function () {}
 
-        // Users have closet space at /user/<name>/*
-        var closet_space_key = /^(user\/[^\/]+)\/.*/
-        var private_closet_space_key = /^user\/[^\/]+\/private.*/
+        // Users have closet space at @<name>/*
+        var closet_space_key = /^(@[^\/]+)\/.*/
+        var private_closet_space_key = /^@[^\/]+\/private.*/
 
         // User
-        client('user/*').setter = function (o, t) {
+        client(prefix + '*').setter = function (o, t) {
             var c = client.get('current_user')
-            var user_key = o.key.match(/^user\/([^\/]+)/)
-            user_key = user_key && ('user/' + user_key[1])
+            var user_key = o.key.match(/^@([^\/]+)/)
+            user_key = user_key && (prefix + user_key[1])
 
             // Only the current user can touch himself.
             if (!c.val.logged_in || c.val.user.link !== user_key) {
@@ -1985,7 +1993,7 @@ function import_server (bus, make_statebus, options)
                 return
             }
 
-            // Users have closet space at /user/<name>/*
+            // Users have closet space at @<name>/*
             if (o.key.match(closet_space_key)) {
                 client.log('saving closet data')
                 master.set(o, t)
@@ -1993,7 +2001,7 @@ function import_server (bus, make_statebus, options)
             }
 
             // Ok, then it must be a plain user
-            console.assert(o.key.match(/^user\/[^\/]+$/))
+            console.assert(o.key.match(/^@[^\/]+$/))
 
             // Validate types
             if (!client.validate(o, {key: 'string',
@@ -2072,11 +2080,11 @@ function import_server (bus, make_statebus, options)
 
             master.set(u)
         }
-        client('user/*').getter = function user_getter (k) {
+        client(prefix + '*').getter = function user_getter (k) {
             var c = client.get('current_user')
             client.log('* getting:', k, 'as', c.val.user)
 
-            // Users have closet space at /user/<name>/*
+            // Users have closet space at @<name>/*
             if (k.match(closet_space_key)) {
                 var obj_user = k.match(closet_space_key)[1]
                 if (k.match(private_closet_space_key)
@@ -2091,10 +2099,10 @@ function import_server (bus, make_statebus, options)
             // Otherwise return the actual user
             return user_obj(k, c.val.logged_in && c.val.user.link === k)
         }
-        client('user/*').deleter = function () {}
+        client(prefix + '*').deleter = function () {}
         function user_obj (k, logged_in) {
             var o = master.clone(master.get(k))
-            if (k.match(/^user\/([^\/]+)\/private\/(.*)$/))
+            if (k.match(/^@([^\/]+)\/private\/(.*)$/))
                 return logged_in ? o : {key: k}
 
             o.val = o.val || {}
@@ -2434,7 +2442,7 @@ function import_server (bus, make_statebus, options)
         path = path || 'client.js'
         bus.http.get('/' + path, (req, res) => {
             var files =
-                ['extras/coffee.js', 'extras/sockjs.js', 'extras/react.js',
+                ['extras/coffee.js', 'extras/sockjs.js',
                  'statebus.js', 'client.js'].map((f) => fs.readFileSync('node_modules/statebus/' + f))
             files.unshift(fs.readFileSync(
                 'node_modules/braidify/braidify-client.js'
@@ -2530,7 +2538,7 @@ function free_the_cors (req, res, next) {
     var free_the_cors = {
         "Access-Control-Allow-Origin": "*",
         "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
-        "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, patches, cache-control"
+        "Access-Control-Allow-Headers": "subscribe, peer, version, parents, merge-type, content-type, patches, cache-control, put-order"
     }
     Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]))
     if (req.method === 'OPTIONS') {