fixed doSync bug, fixed connection problems, improved p2p sync method - still

there are some cases that may lead to inconsistencies. Currently, only the master-slave method is a reliable sync method

build/browser/y-object.html

@@ -0,0 +1,7 @@
+
+<polymer-element name="y-object" hidden attributes="val connector y">
+</polymer-element>
+<polymer-element name="y-property" hidden attributes="val name y">
+</polymer-element>
+
+<script src="./y-object.js"></script>

build/node/ConnectorAdapter.js

@@ -8,8 +8,9 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
     f = ConnectorClass[name];
     connector[name] = f;
   }
+  connector.setIsBoundToY();
   send_ = function(o) {
-    if (o.uid.creator === HB.getUserId() && (typeof o.uid.op_number !== "string")) {
+    if ((o.uid.creator === HB.getUserId()) && (typeof o.uid.op_number !== "string") && (o.uid.doSync === "true" || o.uid.doSync === true) && (HB.getUserId() !== "_temp")) {
       return connector.broadcast(o);
     }
   };
@@ -42,32 +43,27 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
     return encode_state_vector(HB.getOperationCounter());
   };
   getHB = function(v) {
-    var hb, json, o, state_vector, _i, _len;
+    var hb, json, state_vector;
     state_vector = parse_state_vector(v);
     hb = HB._encode(state_vector);
-    for (_i = 0, _len = hb.length; _i < _len; _i++) {
-      o = hb[_i];
-      o.fromHB = "true";
-    }
     json = {
       hb: hb,
       state_vector: encode_state_vector(HB.getOperationCounter())
     };
     return json;
   };
-  applyHB = function(hb) {
-    return engine.applyOp(hb);
+  applyHB = function(hb, fromHB) {
+    return engine.applyOp(hb, fromHB);
   };
   connector.getStateVector = getStateVector;
   connector.getHB = getHB;
   connector.applyHB = applyHB;
   connector.receive_handlers = [];
-  connector.receive_handlers.push(function(sender, op) {
+  return connector.receive_handlers.push(function(sender, op) {
     if (op.uid.creator !== HB.getUserId()) {
       return engine.applyOp(op);
     }
   });
-  return connector.setIsBoundToY();
 };
 
 module.exports = adaptConnector;

build/node/ConnectorClass.js

@@ -24,11 +24,11 @@ module.exports = {
       this.syncMode = "syncAll";
     }
     this.is_synced = false;
-    this.is_syncing = false;
     this.connections = {};
     this.is_bound_to_y = false;
     this.connections = {};
-    return this.current_sync_target = null;
+    this.current_sync_target = null;
+    return this.sent_hb_to_all_users = false;
   },
   isRoleMaster: function() {
     return this.role === "master";
@@ -49,6 +49,9 @@ module.exports = {
         }
       }
     }
+    if (this.current_sync_target == null) {
+      this.setStateSynced();
+    }
     return null;
   },
   userLeft: function(user) {
@@ -57,7 +60,7 @@ module.exports = {
   },
   userJoined: function(user, role) {
     if (role == null) {
-      throw new Error("Internal: You must specify the role of the joined user!");
+      throw new Error("Internal: You must specify the role of the joined user! E.g. userJoined('uid:3939','slave')");
     }
     this.connections[user] = {
       is_synced: false
@@ -101,43 +104,62 @@ module.exports = {
     throw new Error "You must implement send!"
    */
   performSync: function(user) {
+    var hb, o, _hb, _i, _len;
     if (this.current_sync_target == null) {
       this.current_sync_target = user;
-      return this.send(user, {
-        sync_step: "getHB",
-        data: this.getStateVector()
-      });
-    }
-  },
-  performSyncWithMaster: function(user) {
-    var hb, o, _hb, _i, _len;
-    if (!this.is_syncing) {
-      this.current_sync_target = user;
-      this.is_syncing = true;
       this.send(user, {
         sync_step: "getHB",
         send_again: "true",
         data: []
       });
-      hb = this.getHB([]).hb;
-      _hb = [];
-      for (_i = 0, _len = hb.length; _i < _len; _i++) {
-        o = hb[_i];
-        _hb.push(o);
-        if (_hb.length > 30) {
-          this.broadcast({
-            sync_step: "applyHB_",
-            data: _hb
-          });
-          _hb = [];
+      if (!this.sent_hb_to_all_users) {
+        this.sent_hb_to_all_users = true;
+        hb = this.getHB([]).hb;
+        _hb = [];
+        for (_i = 0, _len = hb.length; _i < _len; _i++) {
+          o = hb[_i];
+          _hb.push(o);
+          if (_hb.length > 30) {
+            this.broadcast({
+              sync_step: "applyHB_",
+              data: _hb
+            });
+            _hb = [];
+          }
         }
+        return this.broadcast({
+          sync_step: "applyHB",
+          data: _hb
+        });
       }
-      return this.broadcast({
-        sync_step: "applyHB",
-        data: _hb
-      });
     }
   },
+  performSyncWithMaster: function(user) {
+    var hb, o, _hb, _i, _len;
+    this.current_sync_target = user;
+    this.send(user, {
+      sync_step: "getHB",
+      send_again: "true",
+      data: []
+    });
+    hb = this.getHB([]).hb;
+    _hb = [];
+    for (_i = 0, _len = hb.length; _i < _len; _i++) {
+      o = hb[_i];
+      _hb.push(o);
+      if (_hb.length > 30) {
+        this.broadcast({
+          sync_step: "applyHB_",
+          data: _hb
+        });
+        _hb = [];
+      }
+    }
+    return this.broadcast({
+      sync_step: "applyHB",
+      data: _hb
+    });
+  },
   setStateSynced: function() {
     var f, _i, _len, _ref;
     if (!this.is_synced) {
@@ -152,7 +174,7 @@ module.exports = {
     }
   },
   receiveMessage: function(sender, res) {
-    var data, f, hb, o, send_again, _hb, _i, _j, _len, _len1, _ref, _results;
+    var data, f, hb, o, sendApplyHB, send_again, _hb, _i, _j, _len, _len1, _ref, _results;
     if (res.sync_step == null) {
       _ref = this.receive_handlers;
       _results = [];
@@ -162,22 +184,38 @@ module.exports = {
       }
       return _results;
     } else {
+      if (sender === this.user_id) {
+        return;
+      }
       if (res.sync_step === "getHB") {
         data = this.getHB(res.data);
         hb = data.hb;
         _hb = [];
+        if (this.is_synced) {
+          sendApplyHB = (function(_this) {
+            return function(m) {
+              return _this.send(sender, m);
+            };
+          })(this);
+        } else {
+          sendApplyHB = (function(_this) {
+            return function(m) {
+              return _this.broadcast(m);
+            };
+          })(this);
+        }
         for (_j = 0, _len1 = hb.length; _j < _len1; _j++) {
           o = hb[_j];
           _hb.push(o);
           if (_hb.length > 30) {
-            this.send(sender, {
+            sendApplyHB({
               sync_step: "applyHB_",
               data: _hb
             });
             _hb = [];
           }
         }
-        this.send(sender, {
+        sendApplyHB({
           sync_step: "applyHB",
           data: _hb
         });
@@ -197,14 +235,13 @@ module.exports = {
           return setTimeout(send_again, 3000);
         }
       } else if (res.sync_step === "applyHB") {
-        this.applyHB(res.data);
-        if ((this.syncMode === "syncAll" || (res.sent_again != null)) && !this.is_synced) {
-          this.setStateSynced();
+        this.applyHB(res.data, sender === this.current_sync_target);
+        if ((this.syncMode === "syncAll" || (res.sent_again != null)) && (!this.is_synced) && (this.current_sync_target === sender)) {
           this.connections[sender].is_synced = true;
           return this.findNewSyncTarget();
         }
       } else if (res.sync_step === "applyHB_") {
-        return this.applyHB(res.data);
+        return this.applyHB(res.data, sender === this.current_sync_target);
       }
     }
   },

build/node/Engine.js

@@ -59,13 +59,19 @@ Engine = (function() {
     return this.applyOp(ops_json);
   };
 
-  Engine.prototype.applyOp = function(op_json_array) {
+  Engine.prototype.applyOp = function(op_json_array, fromHB) {
     var o, op_json, _i, _len;
+    if (fromHB == null) {
+      fromHB = false;
+    }
     if (op_json_array.constructor !== Array) {
       op_json_array = [op_json_array];
     }
     for (_i = 0, _len = op_json_array.length; _i < _len; _i++) {
       op_json = op_json_array[_i];
+      if (fromHB) {
+        op_json.fromHB = "true";
+      }
       o = this.parseOperation(op_json);
       if (op_json.fromHB != null) {
         o.fromHB = op_json.fromHB;

build/node/HistoryBuffer.js

@@ -22,7 +22,12 @@ HistoryBuffer = (function() {
     if (own != null) {
       for (o_name in own) {
         o = own[o_name];
-        o.uid.creator = id;
+        if (o.uid.creator != null) {
+          o.uid.creator = id;
+        }
+        if (o.uid.alt != null) {
+          o.uid.alt.creator = id;
+        }
       }
       if (this.buffer[id] != null) {
         throw new Error("You are re-assigning an old user id - this is not (yet) possible!");
@@ -140,7 +145,7 @@ HistoryBuffer = (function() {
       user = _ref[u_name];
       for (o_number in user) {
         o = user[o_number];
-        if (o.uid.doSync && unknown(u_name, o_number)) {
+        if ((o.uid.noOperation == null) && o.uid.doSync && unknown(u_name, o_number)) {
           o_json = o._encode();
           if (o.next_cl != null) {
             o_next = o.next_cl;

build/node/Types/BasicTypes.js

@@ -88,10 +88,18 @@ module.exports = function(HB) {
     };
 
     Operation.prototype.getUid = function() {
+      var map_uid;
       if (this.uid.noOperation == null) {
         return this.uid;
       } else {
-        return this.uid.alt;
+        if (this.uid.alt != null) {
+          map_uid = this.uid.alt.cloneUid();
+          map_uid.sub = this.uid.sub;
+          map_uid.doSync = false;
+          return map_uid;
+        } else {
+          return void 0;
+        }
       }
     };
 

build/node/Types/StructuredTypes.js

@@ -66,17 +66,16 @@ module.exports = function(HB) {
     };
 
     MapManager.prototype.retrieveSub = function(property_name) {
-      var event_properties, event_this, map_uid, rm, rm_uid;
+      var event_properties, event_this, rm, rm_uid;
       if (this.map[property_name] == null) {
         event_properties = {
           name: property_name
         };
         event_this = this;
-        map_uid = this.cloneUid();
-        map_uid.sub = property_name;
         rm_uid = {
           noOperation: true,
-          alt: map_uid
+          sub: property_name,
+          alt: this
         };
         rm = new types.ReplaceManager(event_properties, event_this, rm_uid);
         this.map[property_name] = rm;