Fix up logging in rga.js.

lib/rga.js

@@ -22,13 +22,16 @@ function RGA(id, history, queue) {
   this.downstream = function (sender, op) {
     self._downstream(sender, op);
   };
+  this.downstream._id = id;
 
   if (history !== undefined) {
     for (var i = 0; i < history.length; i++)
       this._downstream(this.downstream, history[i]);
   }
 }
 
+RGA._logging = false;
+
 RGA._browserQueue = {
   defer: function (cb) { setTimeout(cb, 0); }
 };
@@ -48,6 +51,7 @@ RGA.prototype = {
 
   // Apply an operation and broadcast it to other replicas.
   _downstream: function (sender, op) {
+    //this._log("replica " + this.id + " received " + JSON.stringify(op) + " from " + sender._id);
     var self = this.downstream;
     this["_downstream_" + op.type].call(this, op);
     var queue = this._queue;
@@ -256,7 +260,7 @@ RGA.prototype = {
     var ops = delta.ops;
     for (var i = 0; i < ops.length; i++) {
       var op = ops[i];
-      //console.log("* applying", op);
+      //this._log("* applying", op);
       if ("retain" in op) {
         for (var j = 0; j < op.retain;) {
           if (!node.removed) {
@@ -271,7 +275,7 @@ RGA.prototype = {
           if (!node.removed) {
             lastNode = node;
             j++;
-            //console.log("  - removing character:", node.atom);
+            //this._log("  - removing character:", node.atom);
             this._downstream(source, {type: "remove", t: node.timestamp});
           }
           node = next;
@@ -280,7 +284,7 @@ RGA.prototype = {
         var t = lastNode.timestamp;
         var str = op.insert;
         for (var j = 0; j < str.length; j++) {
-          //console.log("  - inserting character:", str[j]);
+          //this._log("  - inserting character:", str[j]);
           var tnext = this._timestamp();
           var next = {atom: str[j], timestamp: tnext};
           this._downstream(source, {type: "addRight", t: t, w: next});
@@ -299,6 +303,11 @@ RGA.prototype = {
         offset++;
     }
     return offset;
+  },
+
+  _log: function () {
+    if (RGA._logging)
+      console.log.apply(console, arguments);
   }
 };
 
@@ -435,7 +444,7 @@ RGA.AceEditorRGA = function AceEditorRga(id, editor, history, queue) {
     if (lastText != erText) {
       infodump.lastText = lastText;
       infodump.rgaText = erText;
-      console.error(rga.id, "lastText and rga are out of sync", infodump);
+      console.error(self.id, "lastText and rga are out of sync", infodump);
       throw new Error("editor and RGA data structure got out of sync");
     }
   }
@@ -448,12 +457,12 @@ RGA.AceEditorRGA = function AceEditorRga(id, editor, history, queue) {
   // First, propagate user edits from Ace to the RGA.
   function takeUserEdits() {
     var currentText = editor.getValue();
-    //console.log("takeUserEdits!! <" + currentText + "> <" + lastText + ">");
+    //self._log("takeUserEdits!! <" + currentText + "> <" + lastText + ">");
     if (currentText != lastText) {
       assertInSync({currentEditorState: currentText});
 
       var changes = RGA.diff(lastText, currentText);
-      //console.log(changes);
+      //self._log(changes);
       self.applyDelta(changes);
       var savedLastText = lastText;
       lastText = currentText;
@@ -481,14 +490,14 @@ RGA.AceEditorRGA = function AceEditorRga(id, editor, history, queue) {
       }
 
       var loc = self.getRowColumnAfter(op.t, op.w.timestamp);
-      //console.log("inserting character", op.w.atom, "at", loc);
+      //self._log("inserting character", op.w.atom, "at", loc);
       withEditorCallbacksDisabled(function () {
         editorSession.insert(loc, op.w.atom);
       });
       break;
 
     case "remove":
-      //console.log("remove:", op.t, " from:", self);
+      //self._log("remove:", op.t, " from:", self);
       if (self._index.get(op.t).removed) {
         // This character has already been removed. Nothing to do.
         break;
@@ -502,7 +511,7 @@ RGA.AceEditorRGA = function AceEditorRga(id, editor, history, queue) {
           ? {row: loc.row + 1, column: 0}
           : {row: loc.row, column: loc.column + 1}
       };
-      //console.log("removing from editor:", whatToRemove);
+      //self._log("removing from editor:", whatToRemove);
       withEditorCallbacksDisabled(function () {
         editorSession.remove(whatToRemove);
       });
@@ -517,7 +526,7 @@ RGA.AceEditorRGA = function AceEditorRga(id, editor, history, queue) {
     // `lastText` and `editor.getValue()` are the result of new user input.
     takeUserEdits();
 
-    //console.log("editorReplica.downstream: received op (from socket):", op);
+    //self._log("editorReplica.downstream: received op (from socket):", op);
 
     // Since applyOpToEditor uses the RGA to look up the location of the
     // inserted/deleted character in the document, and determine whether it has in fact
@@ -527,7 +536,8 @@ RGA.AceEditorRGA = function AceEditorRga(id, editor, history, queue) {
     _base_downstream.call(this, source, op);  // then update the RGA
     lastText = self.editor.getValue();
     assertInSync({op: op});
-  }
+  };
+  this.downstream._id = id;
 };
 
 RGA.AceEditorRGA.prototype = Object.create(RGA.prototype);