Merge branch 'master' of github.com:nodekc/keepee

Merging master

Author: geek

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 () {
@@ -56,8 +60,15 @@ ReadOperation.prototype.success = function (cb) {
 };
 
 var KeePee = function (ws) {
-   this.data = {};
-   this.ws = ws;
+   ws.on('keys', function (keys) {
+      for (var x in keys) {
+         var ro = this.read(keys[x]);
+
+         ro.success(function (d) {
+            this.data[d.key] = d;
+         }.bind(this));
+      }
+   }.bind(this));
 
    ws.on('write', function (d) {
       this.data[d.key] = d;
@@ -67,6 +78,11 @@ var KeePee = function (ws) {
    ws.on('read', function (key) {
       ws.emit('read', this.data[key]);
    });
+
+   ws.emit('keys');
+
+   this.data = {};
+   this.ws = ws;
 };
 
 KeePee.prototype.write = function (key, value) {
@@ -85,7 +101,7 @@ KeePee.prototype.read = function (key) {
 };
 
 
-var kp = new KeePee();
+var kp = new KeePee(ws);
 
 var writeOperation = kp.write('Foo', 'Bar');