Added PeerJs error handlers

build/browser/Connectors/PeerJsConnector.min.js

@@ -1 +1 @@
-!function n(e,t,r){function o(u,s){if(!t[u]){if(!e[u]){var c="function"==typeof require&&require;if(!s&&c)return c(u,!0);if(i)return i(u,!0);throw new Error("Cannot find module '"+u+"'")}var f=t[u]={exports:{}};e[u][0].call(f.exports,function(n){var t=e[u][1][n];return o(t?t:n)},f,f.exports,n,e,t,r)}return t[u].exports}for(var i="function"==typeof require&&require,u=0;u<r.length;u++)o(r[u]);return o}({1:[function(n,e){var t;t=function(){var n,e,t;return t=null,2===arguments.length?(t=new Peer(arguments[0]),e=arguments[1]):(t=new Peer(arguments[0],arguments[1]),e=arguments[2]),n=function(){function n(n,e,r,o){var i;this.engine=n,this.HB=e,this.execution_listener=r,this.yatta=o,this.peer=t,this.connections={},this.peer.on("connection",function(n){return function(e){return n.addConnection(e)}}(this)),i=function(n){return function(e){var t,r,o,i;if(e.uid.creator===n.HB.getUserId()&&"string"!=typeof e.uid.op_number){o=n.connections,i=[];for(r in o)t=o[r],i.push(t.send({op:e}));return i}}}(this),this.execution_listener.push(i)}return n.prototype.connectToPeer=function(n){return null==this.connections[n]&&n!==this.yatta.getUserId()?this.addConnection(t.connect(n)):void 0},n.prototype.getAllConnectionIds=function(){var n,e;e=[];for(n in this.connections)e.push(n);return e},n.prototype.addConnection=function(n){var e,t,r;return this.connections[n.peer]=n,t=!1,e=!1,n.on("data",function(r){return function(o){var i,u,s,c,f;if("empty_message"===o);else{if(null!=o.HB)return t=!0,r.engine.applyOpsCheckDouble(o.HB),n.send({conns:r.getAllConnectionIds()});if(null!=o.op)return r.engine.applyOp(o.op);if(null!=o.conns){for(c=o.conns,f=[],u=0,s=c.length;s>u;u++)i=c[u],f.push(r.connectToPeer(i));return f}if(null==o.state_vector)throw new Error("Can't parse this operation");if(!e)return n.send({HB:r.yatta.getHistoryBuffer()._encode(o.state_vector)}),e=!0}}}(this)),r=function(e){return function(){return n.send({state_vector:e.HB.getOperationCounter()}),t?void 0:setTimeout(r,100)}}(this),r()},n}(),t.on("open",function(t){return e(n,t)})},e.exports=t,"undefined"!=typeof window&&null!==window&&(null==window.Y&&(window.Y={}),window.Y.createPeerJsConnector=t)},{}]},{},[1]);
+!function n(e,t,r){function o(u,c){if(!t[u]){if(!e[u]){var s="function"==typeof require&&require;if(!c&&s)return s(u,!0);if(i)return i(u,!0);throw new Error("Cannot find module '"+u+"'")}var f=t[u]={exports:{}};e[u][0].call(f.exports,function(n){var t=e[u][1][n];return o(t?t:n)},f,f.exports,n,e,t,r)}return t[u].exports}for(var i="function"==typeof require&&require,u=0;u<r.length;u++)o(r[u]);return o}({1:[function(n,e){var t;t=function(){var n,e,t;return t=null,2===arguments.length?(t=new Peer(arguments[0]),e=arguments[1]):(t=new Peer(arguments[0],arguments[1]),t.on("error",function(n){throw new Error("Peerjs connector: "+n)}),t.on("disconnected",function(){throw new Error("Peerjs connector disconnected from signalling server. Cannot accept new connections. Not fatal, but not so good either..")}),e=arguments[2]),n=function(){function n(n,e,r,o){var i;this.engine=n,this.HB=e,this.execution_listener=r,this.yatta=o,this.peer=t,this.connections={},this.peer.on("connection",function(n){return function(e){return n.addConnection(e)}}(this)),i=function(n){return function(e){var t,r,o,i;if(e.uid.creator===n.HB.getUserId()&&"string"!=typeof e.uid.op_number){o=n.connections,i=[];for(r in o)t=o[r],i.push(t.send({op:e}));return i}}}(this),this.execution_listener.push(i)}return n.prototype.connectToPeer=function(n){return null==this.connections[n]&&n!==this.yatta.getUserId()?this.addConnection(t.connect(n)):void 0},n.prototype.getAllConnectionIds=function(){var n,e;e=[];for(n in this.connections)e.push(n);return e},n.prototype.addConnection=function(n){var e,t,r;return this.connections[n.peer]=n,t=!1,e=!1,n.on("data",function(r){return function(o){var i,u,c,s,f;if("empty_message"===o);else{if(null!=o.HB)return t=!0,r.engine.applyOpsCheckDouble(o.HB),n.send({conns:r.getAllConnectionIds()});if(null!=o.op)return r.engine.applyOp(o.op);if(null!=o.conns){for(s=o.conns,f=[],u=0,c=s.length;c>u;u++)i=s[u],f.push(r.connectToPeer(i));return f}if(null==o.state_vector)throw new Error("Can't parse this operation");if(!e)return n.send({HB:r.yatta.getHistoryBuffer()._encode(o.state_vector)}),e=!0}}}(this)),r=function(e){return function(){return n.send({state_vector:e.HB.getOperationCounter()}),t?void 0:setTimeout(r,100)}}(this),r()},n}(),t.on("open",function(t){return e(n,t)})},e.exports=t,"undefined"!=typeof window&&null!==window&&(null==window.Y&&(window.Y={}),window.Y.createPeerJsConnector=t)},{}]},{},[1]);

build/node/Connectors/PeerJsConnector.js

@@ -9,6 +9,12 @@
       callback = arguments[1];
     } else {
       peer = new Peer(arguments[0], arguments[1]);
+      peer.on('error', function(err) {
+        throw new Error("Peerjs connector: " + err);
+      });
+      peer.on('disconnected', function() {
+        throw new Error("Peerjs connector disconnected from signalling server. Cannot accept new connections. Not fatal, but not so good either..");
+      });
       callback = arguments[2];
     }
     PeerJsConnector = (function() {

build/node/Types/StructuredTypes.js

@@ -255,8 +255,8 @@
           }
         });
         addPropertyListener = function(event, op) {
-          repl_manager.parent.callEvent('addProperty', property_name, op);
-          return repl_manager.deleteListener('addProperty', addPropertyListener);
+          repl_manager.deleteListener('addProperty', addPropertyListener);
+          return repl_manager.parent.callEvent('addProperty', property_name, op);
         };
         this.on('insert', addPropertyListener);
         return ReplaceManager.__super__.setParent.call(this, parent);

build/node/Types/XmlTypes.js

@@ -28,17 +28,21 @@
     XmlType = (function(_super) {
       __extends(XmlType, _super);
 
-      function XmlType(uid, tagname, attributes, elements, xml, prev, next, origin) {
-        var attr, element, i, last, n, word, _i, _j, _len, _ref, _ref1;
+      function XmlType(uid, tagname, attributes, elements, xml) {
+        var attr, element, i, n, word, _i, _j, _len, _ref, _ref1;
         this.tagname = tagname;
         this.xml = xml;
-        if ((prev != null) && (next == null) && (prev.type != null)) {
-          while (prev.isDeleted()) {
-            prev = prev.prev_cl;
-          }
-          next = prev.next_cl;
-        }
-        XmlType.__super__.constructor.call(this, uid, prev, next, origin);
+
+        /* In case you make this instanceof Insert again
+        if prev? and (not next?) and prev.type?
+           * adjust what you actually mean. you want to insert after prev, then
+           * next is not defined. but we only insert after non-deleted elements.
+           * This is also handled in TextInsert.
+          while prev.isDeleted()
+            prev = prev.prev_cl
+          next = prev.next_cl
+         */
+        XmlType.__super__.constructor.call(this);
         if ((attributes != null) && (elements != null)) {
           this.saveOperation('attributes', attributes);
           this.saveOperation('elements', elements);
@@ -66,8 +70,7 @@
               word.push(n.textContent);
               this.elements.push(word);
             } else if (n.nodeType === n.ELEMENT_NODE) {
-              last = this.elements.end;
-              element = new XmlType(void 0, void 0, void 0, void 0, n, last.prev_cl, last);
+              element = new XmlType(void 0, void 0, void 0, void 0, n);
               HB.addOperation(element).execute();
               this.elements.push(element);
             } else {
@@ -102,8 +105,9 @@
           } else {
             prev = this._yatta.elements.end.prev_cl;
           }
-          element = new XmlType(void 0, void 0, void 0, void 0, insertedNode, prev);
-          return HB.addOperation(element).execute();
+          element = new XmlType(void 0, void 0, void 0, void 0);
+          HB.addOperation(element).execute();
+          return this.elements.insertAfter(prev, element);
         });
       };
 
@@ -161,19 +165,14 @@
       };
 
       XmlType.prototype._encode = function() {
-        var json, _ref, _ref1, _ref2;
+        var json;
         json = {
           'type': this.type,
           'attributes': this.attributes.getUid(),
           'elements': this.elements.getUid(),
           'tagname': this.tagname,
-          'uid': this.getUid(),
-          'prev': (_ref = this.prev_cl) != null ? _ref.getUid() : void 0,
-          'next': (_ref1 = this.next_cl) != null ? _ref1.getUid() : void 0
+          'uid': this.getUid()
         };
-        if (this.origin !== this.prev_cl) {
-          json["origin"] = (_ref2 = this.origin) != null ? _ref2.getUid() : void 0;
-        }
         return json;
       };
 
@@ -181,9 +180,9 @@
 
     })(types.Insert);
     parser['XmlType'] = function(json) {
-      var attributes, elements, next, origin, prev, tagname, uid;
-      uid = json['uid'], attributes = json['attributes'], elements = json['elements'], tagname = json['tagname'], prev = json['prev'], next = json['next'], origin = json['origin'];
-      return new XmlType(uid, tagname, attributes, elements, void 0, prev, next, origin);
+      var attributes, elements, tagname, uid;
+      uid = json['uid'], attributes = json['attributes'], elements = json['elements'], tagname = json['tagname'];
+      return new XmlType(uid, tagname, attributes, elements, void 0);
     };
     types['XmlType'] = XmlType;
     return json_types;