WIP: Peering

README.md

@@ -2,6 +2,7 @@ Maki
 ==============
 [![Build Status](https://img.shields.io/travis/martindale/maki.svg?branch=master&style=flat-square)](https://travis-ci.org/martindale/maki)
 [![Coverage Status](https://img.shields.io/coveralls/martindale/maki.svg?style=flat-square)](https://coveralls.io/r/martindale/maki)
+![Project Status](https://img.shields.io/badge/status-alpha-red.svg?style=flat-square)
 [![Community](https://chat.maki.io/badge.svg)](https://chat.maki.io/)
 
 The complete stack for building extensible apps, faster than ever.  Hand-roll your application by telling Maki what your application does, and it takes care of the rest – without getting in your way if you want to customize it.

components/404.jade

@@ -1,7 +1,16 @@
 dom-module#maki-undefined
   template
-    .ui.container
-      h1 Not Found
+    .ui.text.container
+      h1 Nothing known.
+      p We're sorry, but we don't know anything about that.  Here are some alternative resources you might be interested in.
+
+      .ui.horizontal.segments
+        .ui.segment
+          p One
+        .ui.segment
+          p Two
+        .ui.segment
+          p Two
   script.
     Polymer({
       is: 'maki-undefined'

components/application.jade

@@ -48,8 +48,8 @@ dom-module#maki-application
                   i.icon.medium
                   |  Medium
 
-  script(src="/js/page.min.js")
-  script(src="/js/jquery.js")
+  script(src="/js/page.min.js", async)
+  script(src="/js/jquery.js", async)
   script.
     window.maki = Polymer({
       is: 'maki-application',

components/channel.jade

@@ -1,10 +1,13 @@
 dom-module#maki-channel
-  script(src="/js/uuid.js")
-  script(src="/js/jsonrpc.js")
+  script(src="/js/uuid.js", async)
+  script(src="/js/jsonrpc.js", async)
   script.
     Polymer({
       is: 'maki-channel',
       properties: {
+        namespace: { 
+          type: String
+        },
         autoconnect: {
           type: Boolean
         },
@@ -21,13 +24,6 @@ dom-module#maki-channel
           type: String
         },
       },
-      ready: function() {
-        var self = this;
-        console.log('[MAKI:CHANNEL]', 'ready');
-        if (self.autoconnect === true) {
-          self._connect();
-        }
-      },
       _send: function(method, params) {
         var self = this;
         self.ws.send(JSON.stringify({
@@ -55,9 +51,54 @@ dom-module#maki-channel
           self._subscribe(element.src);
         }
       },
+      _handleMessage: function(msg) {
+        var self = this;
+        console.log('[MAKI:CHANNEL]', '_handleMessage', msg);
+
+        try {
+          var data = JSON.parse( msg.data );
+        } catch (e) {
+          var data = {};
+        }
+
+        console.log('[MAKI:CHANNEL]', '_handleMessage', 'resulting data:', data);
+
+        // experimental JSON-RPC implementation
+        if (data.jsonrpc === '2.0') {
+          console.log('[MAKI:CHANNEL]', '_handleMessage', 'valid jsonrpc!');
+
+          switch (data.method) {
+            case 'ping':
+              console.log('[MAKI:CHANNEL]', 'received ping.  playing pong...');
+              self.ws.send(JSON.stringify({
+                'jsonrpc': '2.0',
+                'result': 'pong',
+                'id': data.id
+              }));
+            break;
+            case 'patch':
+              // TODO: update in-memory data (two-way binding);
+              console.log('[MAKI:CHANNEL]', 'received `patch` event:', data.params.channel , data );
+              var channel = data.params.channel;
+              var ops = data.params.ops;
+              var datastore = document.querySelector('maki-datastore[name='+self.namespace+']');
+              var manager = document.querySelector('maki-peer-manager');
+
+              datastore._patch(channel, ops);
+              manager._relay(data);
+
+            break;
+            default:
+              console.error('[MAKI:CHANNEL]', 'unhandled jsonrpc method ' , data.method);
+            break;
+          }
+        } else {
+
+        }
+      },
       _connect: function() {
         var self = this;
-        var maki = document.querySelectorAll('maki-application')[0];
+        var maki = document.querySelector('maki-application');
         var protocol = (document.location.protocol === 'http:') ? 'ws://' : 'wss://';
         var path = protocol + document.location.host; // + self.src;
 
@@ -71,43 +112,16 @@ dom-module#maki-channel
             }, 500);
           }
         }
-        self.ws.onmessage = function onMessage(msg) {
-          try {
-            var data = JSON.parse( msg.data );
-          } catch (e) {
-            var data = {};
-          }
-          // experimental JSON-RPC implementation
-          if (data.jsonrpc === '2.0') {
-            switch (data.method) {
-              case 'ping':
-                console.log('[MAKI:CHANNEL]', 'received ping.  playing pong...');
-                self.ws.send(JSON.stringify({
-                  'jsonrpc': '2.0',
-                  'result': 'pong',
-                  'id': data.id
-                }));
-              break;
-              case 'patch':
-                // TODO: update in-memory data (two-way binding);
-                console.log('[MAKI:CHANNEL]', 'received `patch` event:', data.params.channel , data );
-                var channel = data.params.channel;
-                var ops = data.params.ops;
-                var datastore = document.querySelectorAll('maki-datastore')[0];
-
-                datastore._patch(channel, ops);
-
-              break;
-              default:
-                console.error('[MAKI:CHANNEL]', 'unhandled jsonrpc method ' , data.method);
-              break;
-            }
-          } else {
-
-          }
-        }
+        self.ws.onmessage = self._handleMessage.bind(self);
         self.ws.onopen = function onOpen() {
           console.log('[MAKI:CHANNEL]', 'websocket open.');
         }
       },
+      ready: function() {
+        var self = this;
+        console.log('[MAKI:CHANNEL]', 'ready');
+        if (self.autoconnect === true) {
+          self._connect();
+        }
+      },
     });

components/content-store.jade

@@ -0,0 +1,25 @@
+dom-module#maki-content-store
+  template
+    maki-crypto-worker
+    //- TODO: replace this with maki-peer-manager
+    maki-key-value(name="fabric")
+  script.
+    Polymer({
+      is: 'maki-content-store',
+      _get: function(key, cb) {
+        var db = document.querySelector('maki-key-value[name=fabric]');
+        db._retrieve(key, cb);
+      },
+      _store: function(doc, cb) {
+        var db = document.querySelector('maki-key-value[name=fabric]');
+        var worker = document.querySelector('maki-crypto-worker');
+        if (typeof doc !== 'string') {
+          doc = JSON.stringify(doc);
+        }
+        worker._digest(doc, function(err, hash) {
+          db._store(hash, doc, function(err) {
+            cb(err, hash);
+          });
+        });
+      }
+    });