merge

dynajoe · dynajoe · commit 23e5bb6cae27 · 2014-04-15T20:42:55.000-05:00
diff --git a/client.js b/client.js
@@ -13,16 +13,20 @@ var WriteOperation = function (ws, key, value) {
       'success': [],
       'fail': []
    };
-
-   ws.on('confirm', function (d) {
+   var cb = function (d) {
       if (d.id !== id) {
          return;
       }
 
       this.callbacks['success'].forEach(function (cb) {
          cb();
       });
-   }.bind(this));
+
+      ws.removeListener(cb);
+
+   }.bind(this);
+
+   ws.on('confirm', cb);
 };
 
 WriteOperation.prototype.commit = function () {
@@ -97,7 +101,7 @@ KeePee.prototype.read = function (key) {
 };
 
 
-var kp = new KeePee();
+var kp = new KeePee(ws);
 
 var writeOperation = kp.write('Foo', 'Bar');
 
diff --git a/lib/index.js b/lib/index.js
@@ -12,14 +12,14 @@ var internals = {};
 internals.defaults = {
     endpoint: '/',
     host: 'localhost',
-    port: 0
+    port: 0,
+    data: {}
 };
 
 
 exports.register = function (plugin, options, next) {
 
     var settings = Hoek.applyToDefaults(internals.defaults, options || {});
-
     var server = new plugin.hapi.Server(settings.host, settings.port);
     server.start(function () {
 
@@ -32,28 +32,31 @@ exports.register = function (plugin, options, next) {
             handler: internals.handler(template)
         });
 
+        plugin.route({
+            method: 'GET',
+            path: '/client.js',
+            handler: {
+                file:  __dirname + '/../client.js'
+            }
+        });
+
+        plugin.route({
+            method: 'GET',
+            path: '/socket.io.min.js',
+            handler: {
+                file:  __dirname + '/../socket.io.min.js'
+            }
+        });
+
         var ws = new Ws.Server({ server: server.listener });
         ws.on('connection', function (socket) {
 
             subscribers.push(socket);
             socket.send('Welcome');
+            socket.on('message', internals.message(socket));
         });
 
-        var oldStdout = process.stdout.write.bind(process.stdout);
-        process.stdout.write = function (chunk, encoding) {
-
-            oldStdout(chunk, encoding);
-            transmit(chunk);
-        };
-
-        var oldStderr = process.stderr.write.bind(process.stderr);
-        process.stderr.write = function (chunk, encoding) {
-
-            oldStderr(chunk, encoding);
-            transmit(chunk);
-        };
-
-        var transmit = function (data) {
+        internals.transmit = function (data) {
 
             for (var i = 0, il = subscribers.length; i < il; ++i) {
                 try {
@@ -70,6 +73,15 @@ exports.register = function (plugin, options, next) {
 };
 
 
+internals.message = function (socket) {
+
+    return function (data) {
+
+        internals.transmit(data);
+    };
+};
+
+
 internals.handler = function (template) {
 
     return function (request, reply) {
@@ -84,6 +96,8 @@ internals.template = function (host, port) {
     return '<!DOCTYPE html><html lang="en"><head><title>Debug Terminal</title>' +
         '<meta http-equiv="Content-Language" content="en-us">' +
         '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">' +
+        '<script type="application/json" src="/socket.io.min.js"></script>' +
+        '<script type="application/json" src="/client.js"></script>' +
         '</head><body>' +
         '<script language="javascript">' +
         'var ws = new WebSocket("ws://' + host + ':' + port + '");' +
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
   },
   "homepage": "https://github.com/nodekc/keepee",
   "dependencies": {
+    "socket.io": "0.9.x",
     "ws": "0.4.x",
     "hoek": "1.x.x",
     "hapi": "4.x.x"
diff --git a/socket.io.min.js b/socket.io.min.js
