braidfs 0.0.12

package/README.md

@@ -0,0 +1,2 @@
+# braidfs
+braid technology synchronizing files and webpages

package/diff.js

@@ -0,0 +1,785 @@
+
+var DIFF_DELETE = -1;
+var DIFF_INSERT = 1;
+var DIFF_EQUAL = 0;
+
+function get_merged_diff_patch(a, b, o) {
+    var a_diff = get_diff_patch(o, a)
+    var b_diff = get_diff_patch(o, b)
+    var ds = []
+    var prev_d = null
+    while (a_diff.length > 0 || b_diff.length > 0) {
+        var d = a_diff.length == 0 ?
+            b_diff.shift() :
+            b_diff.length == 0 ?
+                a_diff.shift() :
+                a_diff[0][0] < b_diff[0][0] ?
+                    a_diff.shift() :
+                    a_diff[0][0] > b_diff[0][0] ?
+                        b_diff.shift() :
+                        a_diff[0][2] < b_diff[0][2] ?
+                            a_diff.shift() :
+                            b_diff.shift()
+        if (prev_d && d[0] < prev_d[0] + prev_d[1]) {
+            if (d[0] + d[1] > prev_d[0] + prev_d[1]) {
+                prev_d[1] = d[0] + d[1] - prev_d[0]
+            }
+            prev_d[2] += d[2]
+        } else {
+            ds.push(d)
+            prev_d = d
+        }
+    }
+    return ds
+}
+
+function apply_diff_patch(s, diff) {
+    var offset = 0
+    for (var i = 0; i < diff.length; i++) {
+        var d = diff[i]
+        s = s.slice(0, d[0] + offset) + d[2] + s.slice(d[0] + offset + d[1])
+        offset += d[2].length - d[1]
+    }
+    return s
+}
+
+function diff_convert_to_my_format(d, factor) {
+    if (factor === undefined) factor = 1
+    var x = []
+    var ii = 0
+    for (var i = 0; i < d.length; i++) {
+        var dd = d[i]
+        if (dd[0] == DIFF_EQUAL) {
+            ii += dd[1].length
+            continue
+        }
+        var xx = [ii, 0, '']
+        if (dd[0] == DIFF_INSERT * factor) {
+            xx[2] = dd[1]
+        } else if (dd[0] == DIFF_DELETE * factor) {
+            xx[1] = dd[1].length
+            ii += xx[1]
+        }
+        if (i + 1 < d.length) {
+            dd = d[i + 1]
+            if (dd[0] != DIFF_EQUAL) {
+                if (dd[0] == DIFF_INSERT * factor) {
+                    xx[2] = dd[1]
+                } else if (dd[0] == DIFF_DELETE * factor) {
+                    xx[1] = dd[1].length
+                    ii += xx[1]
+                }
+                i++
+            }
+        }
+        x.push(xx)
+    }
+    return x
+}
+
+function get_diff_patch(a, b) {
+    return diff_convert_to_my_format(diff_main(a, b))
+}
+
+function get_diff_patch_2(a, b) {
+    var x = diff_main(a, b)
+    return [diff_convert_to_my_format(x),
+        diff_convert_to_my_format(x, -1)]
+}
+
+//diffsync.get_diff_patch = get_diff_patch
+//diffsync.get_diff_patch_2 = get_diff_patch_2
+
+/**
+ * This library modifies the diff-patch-match library by Neil Fraser
+ * by removing the patch and match functionality and certain advanced
+ * options in the diff function. The original license is as follows:
+ *
+ * ===
+ *
+ * Diff Match and Patch
+ *
+ * Copyright 2006 Google Inc.
+ * http://code.google.com/p/google-diff-match-patch/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * The data structure representing a diff is an array of tuples:
+ * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
+ * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
+ */
+var DIFF_DELETE = -1;
+var DIFF_INSERT = 1;
+var DIFF_EQUAL = 0;
+
+
+/**
+ * Find the differences between two texts.  Simplifies the problem by stripping
+ * any common prefix or suffix off the texts before diffing.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {Int} cursor_pos Expected edit position in text1 (optional)
+ * @return {Array} Array of diff tuples.
+ */
+function diff_main(text1, text2, cursor_pos) {
+  // Check for equality (speedup).
+  if (text1 == text2) {
+    if (text1) {
+      return [[DIFF_EQUAL, text1]];
+    }
+    return [];
+  }
+
+  // Check cursor_pos within bounds
+  if (cursor_pos < 0 || text1.length < cursor_pos) {
+    cursor_pos = null;
+  }
+
+  // Trim off common prefix (speedup).
+  var commonlength = diff_commonPrefix(text1, text2);
+  var commonprefix = text1.substring(0, commonlength);
+  text1 = text1.substring(commonlength);
+  text2 = text2.substring(commonlength);
+
+  // Trim off common suffix (speedup).
+  commonlength = diff_commonSuffix(text1, text2);
+  var commonsuffix = text1.substring(text1.length - commonlength);
+  text1 = text1.substring(0, text1.length - commonlength);
+  text2 = text2.substring(0, text2.length - commonlength);
+
+  // Compute the diff on the middle block.
+  var diffs = diff_compute_(text1, text2);
+
+  // Restore the prefix and suffix.
+  if (commonprefix) {
+    diffs.unshift([DIFF_EQUAL, commonprefix]);
+  }
+  if (commonsuffix) {
+    diffs.push([DIFF_EQUAL, commonsuffix]);
+  }
+  diff_cleanupMerge(diffs);
+  if (cursor_pos != null) {
+    diffs = fix_cursor(diffs, cursor_pos);
+  }
+  return diffs;
+};
+
+
+/**
+ * Find the differences between two texts.  Assumes that the texts do not
+ * have any common prefix or suffix.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @return {Array} Array of diff tuples.
+ */
+function diff_compute_(text1, text2) {
+  var diffs;
+
+  if (!text1) {
+    // Just add some text (speedup).
+    return [[DIFF_INSERT, text2]];
+  }
+
+  if (!text2) {
+    // Just delete some text (speedup).
+    return [[DIFF_DELETE, text1]];
+  }
+
+  var longtext = text1.length > text2.length ? text1 : text2;
+  var shorttext = text1.length > text2.length ? text2 : text1;
+  var i = longtext.indexOf(shorttext);
+  if (i != -1) {
+    // Shorter text is inside the longer text (speedup).
+    diffs = [[DIFF_INSERT, longtext.substring(0, i)],
+             [DIFF_EQUAL, shorttext],
+             [DIFF_INSERT, longtext.substring(i + shorttext.length)]];
+    // Swap insertions for deletions if diff is reversed.
+    if (text1.length > text2.length) {
+      diffs[0][0] = diffs[2][0] = DIFF_DELETE;
+    }
+    return diffs;
+  }
+
+  if (shorttext.length == 1) {
+    // Single character string.
+    // After the previous speedup, the character can't be an equality.
+    return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
+  }
+
+  // Check to see if the problem can be split in two.
+  var hm = diff_halfMatch_(text1, text2);
+  if (hm) {
+    // A half-match was found, sort out the return data.
+    var text1_a = hm[0];
+    var text1_b = hm[1];
+    var text2_a = hm[2];
+    var text2_b = hm[3];
+    var mid_common = hm[4];
+    // Send both pairs off for separate processing.
+    var diffs_a = diff_main(text1_a, text2_a);
+    var diffs_b = diff_main(text1_b, text2_b);
+    // Merge the results.
+    return diffs_a.concat([[DIFF_EQUAL, mid_common]], diffs_b);
+  }
+
+  return diff_bisect_(text1, text2);
+};
+
+
+/**
+ * Find the 'middle snake' of a diff, split the problem in two
+ * and return the recursively constructed diff.
+ * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @return {Array} Array of diff tuples.
+ * @private
+ */
+function diff_bisect_(text1, text2) {
+  // Cache the text lengths to prevent multiple calls.
+  var text1_length = text1.length;
+  var text2_length = text2.length;
+  var max_d = Math.ceil((text1_length + text2_length) / 2);
+  var v_offset = max_d;
+  var v_length = 2 * max_d;
+  var v1 = new Array(v_length);
+  var v2 = new Array(v_length);
+  // Setting all elements to -1 is faster in Chrome & Firefox than mixing
+  // integers and undefined.
+  for (var x = 0; x < v_length; x++) {
+    v1[x] = -1;
+    v2[x] = -1;
+  }
+  v1[v_offset + 1] = 0;
+  v2[v_offset + 1] = 0;
+  var delta = text1_length - text2_length;
+  // If the total number of characters is odd, then the front path will collide
+  // with the reverse path.
+  var front = (delta % 2 != 0);
+  // Offsets for start and end of k loop.
+  // Prevents mapping of space beyond the grid.
+  var k1start = 0;
+  var k1end = 0;
+  var k2start = 0;
+  var k2end = 0;
+  for (var d = 0; d < max_d; d++) {
+    // Walk the front path one step.
+    for (var k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
+      var k1_offset = v_offset + k1;
+      var x1;
+      if (k1 == -d || (k1 != d && v1[k1_offset - 1] < v1[k1_offset + 1])) {
+        x1 = v1[k1_offset + 1];
+      } else {
+        x1 = v1[k1_offset - 1] + 1;
+      }
+      var y1 = x1 - k1;
+      while (x1 < text1_length && y1 < text2_length &&
+             text1.charAt(x1) == text2.charAt(y1)) {
+        x1++;
+        y1++;
+      }
+      v1[k1_offset] = x1;
+      if (x1 > text1_length) {
+        // Ran off the right of the graph.
+        k1end += 2;
+      } else if (y1 > text2_length) {
+        // Ran off the bottom of the graph.
+        k1start += 2;
+      } else if (front) {
+        var k2_offset = v_offset + delta - k1;
+        if (k2_offset >= 0 && k2_offset < v_length && v2[k2_offset] != -1) {
+          // Mirror x2 onto top-left coordinate system.
+          var x2 = text1_length - v2[k2_offset];
+          if (x1 >= x2) {
+            // Overlap detected.
+            return diff_bisectSplit_(text1, text2, x1, y1);
+          }
+        }
+      }
+    }
+
+    // Walk the reverse path one step.
+    for (var k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
+      var k2_offset = v_offset + k2;
+      var x2;
+      if (k2 == -d || (k2 != d && v2[k2_offset - 1] < v2[k2_offset + 1])) {
+        x2 = v2[k2_offset + 1];
+      } else {
+        x2 = v2[k2_offset - 1] + 1;
+      }
+      var y2 = x2 - k2;
+      while (x2 < text1_length && y2 < text2_length &&
+             text1.charAt(text1_length - x2 - 1) ==
+             text2.charAt(text2_length - y2 - 1)) {
+        x2++;
+        y2++;
+      }
+      v2[k2_offset] = x2;
+      if (x2 > text1_length) {
+        // Ran off the left of the graph.
+        k2end += 2;
+      } else if (y2 > text2_length) {
+        // Ran off the top of the graph.
+        k2start += 2;
+      } else if (!front) {
+        var k1_offset = v_offset + delta - k2;
+        if (k1_offset >= 0 && k1_offset < v_length && v1[k1_offset] != -1) {
+          var x1 = v1[k1_offset];
+          var y1 = v_offset + x1 - k1_offset;
+          // Mirror x2 onto top-left coordinate system.
+          x2 = text1_length - x2;
+          if (x1 >= x2) {
+            // Overlap detected.
+            return diff_bisectSplit_(text1, text2, x1, y1);
+          }
+        }
+      }
+    }
+  }
+  // Diff took too long and hit the deadline or
+  // number of diffs equals number of characters, no commonality at all.
+  return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
+};
+
+
+/**
+ * Given the location of the 'middle snake', split the diff in two parts
+ * and recurse.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {number} x Index of split point in text1.
+ * @param {number} y Index of split point in text2.
+ * @return {Array} Array of diff tuples.
+ */
+function diff_bisectSplit_(text1, text2, x, y) {
+  var text1a = text1.substring(0, x);
+  var text2a = text2.substring(0, y);
+  var text1b = text1.substring(x);
+  var text2b = text2.substring(y);
+
+  // Compute both diffs serially.
+  var diffs = diff_main(text1a, text2a);
+  var diffsb = diff_main(text1b, text2b);
+
+  return diffs.concat(diffsb);
+};
+
+
+/**
+ * Determine the common prefix of two strings.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {number} The number of characters common to the start of each
+ *     string.
+ */
+function diff_commonPrefix(text1, text2) {
+  // Quick check for common null cases.
+  if (!text1 || !text2 || text1.charAt(0) != text2.charAt(0)) {
+    return 0;
+  }
+  // Binary search.
+  // Performance analysis: http://neil.fraser.name/news/2007/10/09/
+  var pointermin = 0;
+  var pointermax = Math.min(text1.length, text2.length);
+  var pointermid = pointermax;
+  var pointerstart = 0;
+  while (pointermin < pointermid) {
+    if (text1.substring(pointerstart, pointermid) ==
+        text2.substring(pointerstart, pointermid)) {
+      pointermin = pointermid;
+      pointerstart = pointermin;
+    } else {
+      pointermax = pointermid;
+    }
+    pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  }
+  return pointermid;
+};
+
+
+/**
+ * Determine the common suffix of two strings.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {number} The number of characters common to the end of each string.
+ */
+function diff_commonSuffix(text1, text2) {
+  // Quick check for common null cases.
+  if (!text1 || !text2 ||
+      text1.charAt(text1.length - 1) != text2.charAt(text2.length - 1)) {
+    return 0;
+  }
+  // Binary search.
+  // Performance analysis: http://neil.fraser.name/news/2007/10/09/
+  var pointermin = 0;
+  var pointermax = Math.min(text1.length, text2.length);
+  var pointermid = pointermax;
+  var pointerend = 0;
+  while (pointermin < pointermid) {
+    if (text1.substring(text1.length - pointermid, text1.length - pointerend) ==
+        text2.substring(text2.length - pointermid, text2.length - pointerend)) {
+      pointermin = pointermid;
+      pointerend = pointermin;
+    } else {
+      pointermax = pointermid;
+    }
+    pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  }
+  return pointermid;
+};
+
+
+/**
+ * Do the two texts share a substring which is at least half the length of the
+ * longer text?
+ * This speedup can produce non-minimal diffs.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {Array.<string>} Five element Array, containing the prefix of
+ *     text1, the suffix of text1, the prefix of text2, the suffix of
+ *     text2 and the common middle.  Or null if there was no match.
+ */
+function diff_halfMatch_(text1, text2) {
+  var longtext = text1.length > text2.length ? text1 : text2;
+  var shorttext = text1.length > text2.length ? text2 : text1;
+  if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
+    return null;  // Pointless.
+  }
+
+  /**
+   * Does a substring of shorttext exist within longtext such that the substring
+   * is at least half the length of longtext?
+   * Closure, but does not reference any external variables.
+   * @param {string} longtext Longer string.
+   * @param {string} shorttext Shorter string.
+   * @param {number} i Start index of quarter length substring within longtext.
+   * @return {Array.<string>} Five element Array, containing the prefix of
+   *     longtext, the suffix of longtext, the prefix of shorttext, the suffix
+   *     of shorttext and the common middle.  Or null if there was no match.
+   * @private
+   */
+  function diff_halfMatchI_(longtext, shorttext, i) {
+    // Start with a 1/4 length substring at position i as a seed.
+    var seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
+    var j = -1;
+    var best_common = '';
+    var best_longtext_a, best_longtext_b, best_shorttext_a, best_shorttext_b;
+    while ((j = shorttext.indexOf(seed, j + 1)) != -1) {
+      var prefixLength = diff_commonPrefix(longtext.substring(i),
+                                           shorttext.substring(j));
+      var suffixLength = diff_commonSuffix(longtext.substring(0, i),
+                                           shorttext.substring(0, j));
+      if (best_common.length < suffixLength + prefixLength) {
+        best_common = shorttext.substring(j - suffixLength, j) +
+            shorttext.substring(j, j + prefixLength);
+        best_longtext_a = longtext.substring(0, i - suffixLength);
+        best_longtext_b = longtext.substring(i + prefixLength);
+        best_shorttext_a = shorttext.substring(0, j - suffixLength);
+        best_shorttext_b = shorttext.substring(j + prefixLength);
+      }
+    }
+    if (best_common.length * 2 >= longtext.length) {
+      return [best_longtext_a, best_longtext_b,
+              best_shorttext_a, best_shorttext_b, best_common];
+    } else {
+      return null;
+    }
+  }
+
+  // First check if the second quarter is the seed for a half-match.
+  var hm1 = diff_halfMatchI_(longtext, shorttext,
+                             Math.ceil(longtext.length / 4));
+  // Check again based on the third quarter.
+  var hm2 = diff_halfMatchI_(longtext, shorttext,
+                             Math.ceil(longtext.length / 2));
+  var hm;
+  if (!hm1 && !hm2) {
+    return null;
+  } else if (!hm2) {
+    hm = hm1;
+  } else if (!hm1) {
+    hm = hm2;
+  } else {
+    // Both matched.  Select the longest.
+    hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
+  }
+
+  // A half-match was found, sort out the return data.
+  var text1_a, text1_b, text2_a, text2_b;
+  if (text1.length > text2.length) {
+    text1_a = hm[0];
+    text1_b = hm[1];
+    text2_a = hm[2];
+    text2_b = hm[3];
+  } else {
+    text2_a = hm[0];
+    text2_b = hm[1];
+    text1_a = hm[2];
+    text1_b = hm[3];
+  }
+  var mid_common = hm[4];
+  return [text1_a, text1_b, text2_a, text2_b, mid_common];
+};
+
+
+/**
+ * Reorder and merge like edit sections.  Merge equalities.
+ * Any edit section can move as long as it doesn't cross an equality.
+ * @param {Array} diffs Array of diff tuples.
+ */
+function diff_cleanupMerge(diffs) {
+  diffs.push([DIFF_EQUAL, '']);  // Add a dummy entry at the end.
+  var pointer = 0;
+  var count_delete = 0;
+  var count_insert = 0;
+  var text_delete = '';
+  var text_insert = '';
+  var commonlength;
+  while (pointer < diffs.length) {
+    switch (diffs[pointer][0]) {
+      case DIFF_INSERT:
+        count_insert++;
+        text_insert += diffs[pointer][1];
+        pointer++;
+        break;
+      case DIFF_DELETE:
+        count_delete++;
+        text_delete += diffs[pointer][1];
+        pointer++;
+        break;
+      case DIFF_EQUAL:
+        // Upon reaching an equality, check for prior redundancies.
+        if (count_delete + count_insert > 1) {
+          if (count_delete !== 0 && count_insert !== 0) {
+            // Factor out any common prefixies.
+            commonlength = diff_commonPrefix(text_insert, text_delete);
+            if (commonlength !== 0) {
+              if ((pointer - count_delete - count_insert) > 0 &&
+                  diffs[pointer - count_delete - count_insert - 1][0] ==
+                  DIFF_EQUAL) {
+                diffs[pointer - count_delete - count_insert - 1][1] +=
+                    text_insert.substring(0, commonlength);
+              } else {
+                diffs.splice(0, 0, [DIFF_EQUAL,
+                                    text_insert.substring(0, commonlength)]);
+                pointer++;
+              }
+              text_insert = text_insert.substring(commonlength);
+              text_delete = text_delete.substring(commonlength);
+            }
+            // Factor out any common suffixies.
+            commonlength = diff_commonSuffix(text_insert, text_delete);
+            if (commonlength !== 0) {
+              diffs[pointer][1] = text_insert.substring(text_insert.length -
+                  commonlength) + diffs[pointer][1];
+              text_insert = text_insert.substring(0, text_insert.length -
+                  commonlength);
+              text_delete = text_delete.substring(0, text_delete.length -
+                  commonlength);
+            }
+          }
+          // Delete the offending records and add the merged ones.
+          if (count_delete === 0) {
+            diffs.splice(pointer - count_insert,
+                count_delete + count_insert, [DIFF_INSERT, text_insert]);
+          } else if (count_insert === 0) {
+            diffs.splice(pointer - count_delete,
+                count_delete + count_insert, [DIFF_DELETE, text_delete]);
+          } else {
+            diffs.splice(pointer - count_delete - count_insert,
+                count_delete + count_insert, [DIFF_DELETE, text_delete],
+                [DIFF_INSERT, text_insert]);
+          }
+          pointer = pointer - count_delete - count_insert +
+                    (count_delete ? 1 : 0) + (count_insert ? 1 : 0) + 1;
+        } else if (pointer !== 0 && diffs[pointer - 1][0] == DIFF_EQUAL) {
+          // Merge this equality with the previous one.
+          diffs[pointer - 1][1] += diffs[pointer][1];
+          diffs.splice(pointer, 1);
+        } else {
+          pointer++;
+        }
+        count_insert = 0;
+        count_delete = 0;
+        text_delete = '';
+        text_insert = '';
+        break;
+    }
+  }
+  if (diffs[diffs.length - 1][1] === '') {
+    diffs.pop();  // Remove the dummy entry at the end.
+  }
+
+  // Second pass: look for single edits surrounded on both sides by equalities
+  // which can be shifted sideways to eliminate an equality.
+  // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
+  var changes = false;
+  pointer = 1;
+  // Intentionally ignore the first and last element (don't need checking).
+  while (pointer < diffs.length - 1) {
+    if (diffs[pointer - 1][0] == DIFF_EQUAL &&
+        diffs[pointer + 1][0] == DIFF_EQUAL) {
+      // This is a single edit surrounded by equalities.
+      if (diffs[pointer][1].substring(diffs[pointer][1].length -
+          diffs[pointer - 1][1].length) == diffs[pointer - 1][1]) {
+        // Shift the edit over the previous equality.
+        diffs[pointer][1] = diffs[pointer - 1][1] +
+            diffs[pointer][1].substring(0, diffs[pointer][1].length -
+                                        diffs[pointer - 1][1].length);
+        diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
+        diffs.splice(pointer - 1, 1);
+        changes = true;
+      } else if (diffs[pointer][1].substring(0, diffs[pointer + 1][1].length) ==
+          diffs[pointer + 1][1]) {
+        // Shift the edit over the next equality.
+        diffs[pointer - 1][1] += diffs[pointer + 1][1];
+        diffs[pointer][1] =
+            diffs[pointer][1].substring(diffs[pointer + 1][1].length) +
+            diffs[pointer + 1][1];
+        diffs.splice(pointer + 1, 1);
+        changes = true;
+      }
+    }
+    pointer++;
+  }
+  // If shifts were made, the diff needs reordering and another shift sweep.
+  if (changes) {
+    diff_cleanupMerge(diffs);
+  }
+};
+
+
+/*
+ * Modify a diff such that the cursor position points to the start of a change:
+ * E.g.
+ *   cursor_normalize_diff([[DIFF_EQUAL, 'abc']], 1)
+ *     => [1, [[DIFF_EQUAL, 'a'], [DIFF_EQUAL, 'bc']]]
+ *   cursor_normalize_diff([[DIFF_INSERT, 'new'], [DIFF_DELETE, 'xyz']], 2)
+ *     => [2, [[DIFF_INSERT, 'new'], [DIFF_DELETE, 'xy'], [DIFF_DELETE, 'z']]]
+ *
+ * @param {Array} diffs Array of diff tuples
+ * @param {Int} cursor_pos Suggested edit position. Must not be out of bounds!
+ * @return {Array} A tuple [cursor location in the modified diff, modified diff]
+ */
+function cursor_normalize_diff (diffs, cursor_pos) {
+  if (cursor_pos === 0) {
+    return [DIFF_EQUAL, diffs];
+  }
+  for (var current_pos = 0, i = 0; i < diffs.length; i++) {
+    var d = diffs[i];
+    if (d[0] === DIFF_DELETE || d[0] === DIFF_EQUAL) {
+      var next_pos = current_pos + d[1].length;
+      if (cursor_pos === next_pos) {
+        return [i + 1, diffs];
+      } else if (cursor_pos < next_pos) {
+        // copy to prevent side effects
+        diffs = diffs.slice();
+        // split d into two diff changes
+        var split_pos = cursor_pos - current_pos;
+        var d_left = [d[0], d[1].slice(0, split_pos)];
+        var d_right = [d[0], d[1].slice(split_pos)];
+        diffs.splice(i, 1, d_left, d_right);
+        return [i + 1, diffs];
+      } else {
+        current_pos = next_pos;
+      }
+    }
+  }
+  throw new Error('cursor_pos is out of bounds!')
+}
+
+/*
+ * Modify a diff such that the edit position is "shifted" to the proposed edit location (cursor_position).
+ *
+ * Case 1)
+ *   Check if a naive shift is possible:
+ *     [0, X], [ 1, Y] -> [ 1, Y], [0, X]    (if X + Y === Y + X)
+ *     [0, X], [-1, Y] -> [-1, Y], [0, X]    (if X + Y === Y + X) - holds same result
+ * Case 2)
+ *   Check if the following shifts are possible:
+ *     [0, 'pre'], [ 1, 'prefix'] -> [ 1, 'pre'], [0, 'pre'], [ 1, 'fix']
+ *     [0, 'pre'], [-1, 'prefix'] -> [-1, 'pre'], [0, 'pre'], [-1, 'fix']
+ *         ^            ^
+ *         d          d_next
+ *
+ * @param {Array} diffs Array of diff tuples
+ * @param {Int} cursor_pos Suggested edit position. Must not be out of bounds!
+ * @return {Array} Array of diff tuples
+ */
+function fix_cursor (diffs, cursor_pos) {
+  var norm = cursor_normalize_diff(diffs, cursor_pos);
+  var ndiffs = norm[1];
+  var cursor_pointer = norm[0];
+  var d = ndiffs[cursor_pointer];
+  var d_next = ndiffs[cursor_pointer + 1];
+
+  if (d == null) {
+    // Text was deleted from end of original string,
+    // cursor is now out of bounds in new string
+    return diffs;
+  } else if (d[0] !== DIFF_EQUAL) {
+    // A modification happened at the cursor location.
+    // This is the expected outcome, so we can return the original diff.
+    return diffs;
+  } else {
+    if (d_next != null && d[1] + d_next[1] === d_next[1] + d[1]) {
+      // Case 1)
+      // It is possible to perform a naive shift
+      ndiffs.splice(cursor_pointer, 2, d_next, d)
+      return merge_tuples(ndiffs, cursor_pointer, 2)
+    } else if (d_next != null && d_next[1].indexOf(d[1]) === 0) {
+      // Case 2)
+      // d[1] is a prefix of d_next[1]
+      // We can assume that d_next[0] !== 0, since d[0] === 0
+      // Shift edit locations..
+      ndiffs.splice(cursor_pointer, 2, [d_next[0], d[1]], [0, d[1]]);
+      var suffix = d_next[1].slice(d[1].length);
+      if (suffix.length > 0) {
+        ndiffs.splice(cursor_pointer + 2, 0, [d_next[0], suffix]);
+      }
+      return merge_tuples(ndiffs, cursor_pointer, 3)
+    } else {
+      // Not possible to perform any modification
+      return diffs;
+    }
+  }
+
+}
+
+/*
+ * Try to merge tuples with their neigbors in a given range.
+ * E.g. [0, 'a'], [0, 'b'] -> [0, 'ab']
+ *
+ * @param {Array} diffs Array of diff tuples.
+ * @param {Int} start Position of the first element to merge (diffs[start] is also merged with diffs[start - 1]).
+ * @param {Int} length Number of consecutive elements to check.
+ * @return {Array} Array of merged diff tuples.
+ */
+function merge_tuples (diffs, start, length) {
+  // Check from (start-1) to (start+length).
+  for (var i = start + length - 1; i >= 0 && i >= start - 1; i--) {
+    if (i + 1 < diffs.length) {
+      var left_d = diffs[i];
+      var right_d = diffs[i+1];
+      if (left_d[0] === right_d[1]) {
+        diffs.splice(i, 2, [left_d[0], left_d[1] + right_d[1]]);
+      }
+    }
+  }
+  return diffs;
+}
+
+module.exports = {diff_main}

package/editor.html

@@ -0,0 +1,79 @@
+<body style="background: auto; margin: 0px; padding: 0px">
+  <textarea
+    id="texty"
+    style="width: 100%; height: 100%; box-sizing: border-box"
+  ></textarea>
+</body>
+<script src="https://braid.org/code/myers-diff1.js"></script>
+<script src="https://unpkg.com/braid-http@~0.3/braid-http-client.js"></script>
+<script src="https://unpkg.com/braid-text/simpleton-client.js"></script>
+<script>
+  let simpleton = simpleton_client(location.pathname, {
+    apply_remote_update: ({ state, patches }) => {
+      if (state !== undefined) texty.value = state;
+      else apply_patches_and_update_selection(texty, patches);
+      return texty.value;
+    },
+    generate_local_diff_update: (prev_state) => {
+      var patches = diff(prev_state, texty.value);
+      if (patches.length === 0) return null;
+      return { patches, new_state: texty.value };
+    },
+  });
+
+  texty.value = "";
+  texty.oninput = (e) => simpleton.changed();
+
+  function diff(before, after) {
+    let diff = diff_main(before, after);
+    let patches = [];
+    let offset = 0;
+    for (let d of diff) {
+      let p = null;
+      if (d[0] == 1) p = { range: [offset, offset], content: d[1] };
+      else if (d[0] == -1) {
+        p = { range: [offset, offset + d[1].length], content: "" };
+        offset += d[1].length;
+      } else offset += d[1].length;
+      if (p) {
+        p.unit = "text";
+        patches.push(p);
+      }
+    }
+    return patches;
+  }
+
+  function apply_patches_and_update_selection(textarea, patches) {
+    let offset = 0;
+    for (let p of patches) {
+      p.range[0] += offset;
+      p.range[1] += offset;
+      offset -= p.range[1] - p.range[0];
+      offset += p.content.length;
+    }
+
+    let original = textarea.value;
+    let sel = [textarea.selectionStart, textarea.selectionEnd];
+
+    for (var p of patches) {
+      let range = p.range;
+
+      for (let i = 0; i < sel.length; i++)
+        if (sel[i] > range[0])
+          if (sel[i] > range[1]) sel[i] -= range[1] - range[0];
+          else sel[i] = range[0];
+
+      for (let i = 0; i < sel.length; i++)
+        if (sel[i] > range[0]) sel[i] += p.content.length;
+
+      original =
+        original.substring(0, range[0]) +
+        p.content +
+        original.substring(range[1]);
+    }
+
+    textarea.value = original;
+    textarea.selectionStart = sel[0];
+    textarea.selectionEnd = sel[1];
+  }
+</script>

package/index.js

@@ -0,0 +1,459 @@
+
+let http = require('http');
+
+let { diff_main } = require('./diff.js')
+let braid_text = require("braid-text");
+let braid_fetch = require('braid-http').fetch
+
+let port = 10000
+let cookie = null
+let pin_urls = []
+let pindex_urls = []
+let proxy_base = `./proxy_base`
+
+let argv = process.argv.slice(2)
+while (argv.length) {
+    let a = argv.shift()
+    if (a.match(/^\d+$/)) {
+        port = parseInt(a)
+    } else if (a === '-pin') {
+        let b = argv.shift()
+        if (b === 'index') {
+            pindex_urls.push(argv.shift())
+        } else {
+            pin_urls.push(b)
+        }
+    } else {
+        cookie = a
+        console.log(`cookie = ${cookie}`)
+    }
+}
+console.log({ pin_urls, pindex_urls })
+
+process.on("unhandledRejection", (x) => console.log(`unhandledRejection: ${x.stack}`))
+process.on("uncaughtException", (x) => console.log(`uncaughtException: ${x.stack}`))
+
+const server = http.createServer(async (req, res) => {
+    console.log(`${req.method} ${req.url}`);
+
+    if (req.url === '/favicon.ico') return;
+
+    // Security check: Allow only localhost access
+    const clientIp = req.socket.remoteAddress;
+    if (clientIp !== '127.0.0.1' && clientIp !== '::1') {
+        res.writeHead(403, { 'Content-Type': 'text/plain' });
+        res.end('Access denied: This proxy is only accessible from localhost');
+        return;
+    }
+
+    // Free the CORS
+    free_the_cors(req, res);
+    if (req.method === 'OPTIONS') return;
+
+    if (req.url.endsWith("?editor")) {
+        res.writeHead(200, { "Content-Type": "text/html", "Cache-Control": "no-cache" })
+        require("fs").createReadStream("./editor.html").pipe(res)
+        return
+    }
+
+    if (req.url === '/pages') {
+        var pages = await braid_text.list()
+        res.writeHead(200, {
+            "Content-Type": "application/json",
+            "Access-Control-Expose-Headers": "*"
+        })
+        res.end(JSON.stringify(pages))
+        return
+    }
+
+    let url = req.url.slice(1)
+
+    proxy_url(url)
+
+    // Now serve the collaborative text!
+    braid_text.serve(req, res, { key: url })
+});
+
+server.listen(port, () => {
+    console.log(`Proxy server started on port ${port}`);
+    console.log('This proxy is only accessible from localhost');
+});
+
+for (let url of pin_urls) proxy_url(url)
+pindex_urls.forEach(async url => {
+    let prefix = new URL(url).origin
+    while (true) {
+        let urls = await (await fetch(url)).json()
+        for (let url of urls) proxy_url(prefix + url)
+        await new Promise(done => setTimeout(done, 1000 * 60 * 60))
+    }
+})
+
+braid_text.list().then(x => {
+    for (let xx of x) proxy_url(xx)
+})
+
+////////////////////////////////
+
+async function proxy_url(url) {
+    let chain = proxy_url.chain || (proxy_url.chain = Promise.resolve())
+
+    async function ensure_path(path) {
+        // ensure that the path leading to our file exists..
+        await (chain = chain.then(async () => {
+            try {
+                await require("fs").promises.mkdir(path, { recursive: true })
+            } catch (e) {
+                let parts = path.split(require("path").sep)
+                for (let i = 1; i <= parts.length; i++) {
+                    let partial = require("path").join(...parts.slice(0, i))
+
+                    if (!(await is_dir(partial))) {
+                        let save = await require("fs").promises.readFile(partial)
+
+                        await require("fs").promises.unlink(partial)
+                        await require("fs").promises.mkdir(path, { recursive: true })
+
+                        while (await is_dir(partial))
+                            partial = require("path").join(partial, 'index.html')
+
+                        await require("fs").promises.writeFile(partial, save)
+                        break
+                    }
+                }
+            }
+        }))
+    }
+
+    // normalize url by removing any trailing /index.html/index.html/
+    let normalized_url = url.replace(/(\/index\.html|\/)+$/, '')
+    let wasnt_normal = normalized_url != url
+    url = normalized_url
+
+    if (!proxy_url.cache) proxy_url.cache = {}
+    if (proxy_url.cache[url]) return
+    proxy_url.cache[url] = true
+
+    let path = url.replace(/^https?:\/\//, '')
+    let fullpath = require("path").join(proxy_base, path)
+
+    // if we're accessing /blah/index.html, it will be normalized to /blah,
+    // but we still want to create a directory out of blah in this case
+    if (wasnt_normal && !(await is_dir(fullpath))) ensure_path(fullpath)
+
+    let last_text = ''
+
+    console.log(`proxy_url: ${url}`)
+
+    let peer = Math.random().toString(36).slice(2)
+
+    braid_fetch_wrapper(url, {
+        headers: {
+            "Merge-Type": "dt",
+            Accept: 'text/plain'
+        },
+        subscribe: true,
+        retry: true,
+        parents: async () => {
+            let cur = await braid_text.get(url, {})
+            if (cur.version.length) return cur.version
+        },
+        peer
+    }).then(x => {
+        x.subscribe(update => {
+            // console.log(`update: ${JSON.stringify(update, null, 4)}`)
+            if (update.version.length == 0) return;
+
+            braid_text.put(url, { ...update, peer })
+        })
+    })
+
+    // try a HEAD without subscribe to get the version
+    braid_fetch_wrapper(url, {
+        method: 'HEAD',
+        headers: { Accept: 'text/plain' },
+        retry: true,
+    }).then(async head_res => {
+        let parents = head_res.headers.get('version') ?
+            JSON.parse(`[${head_res.headers.get('version')}]`) :
+            null
+
+        // now get everything since then, and send it back..
+        braid_text.get(url, {
+            parents,
+            merge_type: 'dt',
+            peer,
+            subscribe: async ({ version, parents, body, patches }) => {
+                if (version.length == 0) return;
+
+                // console.log(`local got: ${JSON.stringify({ version, parents, body, patches }, null, 4)}`)
+                // console.log(`cookie = ${cookie}`)
+
+                await braid_fetch_wrapper(url, {
+                    headers: {
+                        "Merge-Type": "dt",
+                        "Content-Type": 'text/plain',
+                        ...(cookie ? { "Cookie": cookie } : {}),
+                    },
+                    method: "PUT",
+                    retry: true,
+                    version, parents, body, patches,
+                    peer
+                })
+            },
+        })
+    })
+
+    await ensure_path(require("path").dirname(fullpath))
+
+    async function get_fullpath() {
+        let p = fullpath
+        while (await is_dir(p)) p = require("path").join(p, 'index.html')
+        return p
+    }
+
+    let simpleton = simpleton_client(url, {
+        apply_remote_update: async ({ state, patches }) => {
+            return await (chain = chain.then(async () => {
+                console.log(`writing file ${await get_fullpath()}`)
+
+                if (state !== undefined) last_text = state
+                else last_text = apply_patches(last_text, patches)
+                await require('fs').promises.writeFile(await get_fullpath(), last_text)
+                return last_text
+            }))
+        },
+        generate_local_diff_update: async (_) => {
+            return await (chain = chain.then(async () => {
+                let text = await require('fs').promises.readFile(await get_fullpath(), { encoding: 'utf8' })
+                var patches = diff(last_text, text)
+                last_text = text
+                return patches.length ? { patches, new_state: last_text } : null
+            }))
+        }
+    })
+
+    if (!proxy_url.path_to_func) proxy_url.path_to_func = {}
+    proxy_url.path_to_func[path] = () => simpleton.changed()
+
+    if (!proxy_url.chokidar) {
+        proxy_url.chokidar = true
+        require('chokidar').watch(proxy_base).on('change', (path) => {
+            path = require('path').relative(proxy_base, path)
+            console.log(`path changed: ${path}`)
+
+            path = path.replace(/(\/index\.html|\/)+$/, '')
+            console.log(`normalized path: ${path}`)
+
+            proxy_url.path_to_func[path]()
+        });
+    }
+}
+
+async function is_dir(p) {
+    try {
+        return (await require("fs").promises.stat(p)).isDirectory()
+    } catch (e) { }
+}
+
+function diff(before, after) {
+    let diff = diff_main(before, after);
+    let patches = [];
+    let offset = 0;
+    for (let d of diff) {
+        let p = null;
+        if (d[0] == 1) p = { range: [offset, offset], content: d[1] };
+        else if (d[0] == -1) {
+            p = { range: [offset, offset + d[1].length], content: "" };
+            offset += d[1].length;
+        } else offset += d[1].length;
+        if (p) {
+            p.unit = "text";
+            patches.push(p);
+        }
+    }
+    return patches;
+}
+
+function free_the_cors(req, res) {
+    res.setHeader('Range-Request-Allow-Methods', 'PATCH, PUT');
+    res.setHeader('Range-Request-Allow-Units', 'json');
+    res.setHeader("Patches", "OK");
+    var free_the_cors = {
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "OPTIONS, HEAD, GET, PUT, UNSUBSCRIBE",
+        "Access-Control-Allow-Headers": "subscribe, client, version, parents, merge-type, content-type, content-range, patches, cache-control, peer"
+    };
+    Object.entries(free_the_cors).forEach(x => res.setHeader(x[0], x[1]));
+    if (req.method === 'OPTIONS') {
+        res.writeHead(200);
+        res.end();
+    }
+}
+
+function apply_patches(originalString, patches) {
+    let offset = 0;
+    for (let p of patches) {
+        p.range[0] += offset;
+        p.range[1] += offset;
+        offset -= p.range[1] - p.range[0];
+        offset += p.content.length;
+    }
+
+    let result = originalString;
+
+    for (let p of patches) {
+        let range = p.range;
+        result =
+            result.substring(0, range[0]) +
+            p.content +
+            result.substring(range[1]);
+    }
+
+    return result;
+}
+
+function simpleton_client(url, { apply_remote_update, generate_local_diff_update, content_type }) {
+    var peer = Math.random().toString(36).slice(2)
+    var current_version = []
+    var prev_state = ""
+    var char_counter = -1
+    var chain = Promise.resolve()
+    var queued_changes = 0
+
+    braid_text.get(url, {
+        peer,
+        subscribe: (update) => {
+            chain = chain.then(async () => {
+                // Only accept the update if its parents == our current version
+                update.parents.sort()
+                if (current_version.length === update.parents.length
+                    && current_version.every((v, i) => v === update.parents[i])) {
+                    current_version = update.version.sort()
+                    update.state = update.body
+
+                    if (update.patches) {
+                        for (let p of update.patches) p.range = p.range.match(/\d+/g).map((x) => 1 * x)
+                        update.patches.sort((a, b) => a.range[0] - b.range[0])
+
+                        // convert from code-points to js-indicies
+                        let c = 0
+                        let i = 0
+                        for (let p of update.patches) {
+                            while (c < p.range[0]) {
+                                i += get_char_size(prev_state, i)
+                                c++
+                            }
+                            p.range[0] = i
+
+                            while (c < p.range[1]) {
+                                i += get_char_size(prev_state, i)
+                                c++
+                            }
+                            p.range[1] = i
+                        }
+                    }
+
+                    prev_state = await apply_remote_update(update)
+                }
+            })
+        }
+    })
+
+    return {
+        changed: () => {
+            if (queued_changes) return
+            queued_changes++
+            chain = chain.then(async () => {
+                queued_changes--
+                var update = await generate_local_diff_update(prev_state)
+                if (!update) return   // Stop if there wasn't a change!
+                var { patches, new_state } = update
+
+                // convert from js-indicies to code-points
+                let c = 0
+                let i = 0
+                for (let p of patches) {
+                    while (i < p.range[0]) {
+                        i += get_char_size(prev_state, i)
+                        c++
+                    }
+                    p.range[0] = c
+
+                    while (i < p.range[1]) {
+                        i += get_char_size(prev_state, i)
+                        c++
+                    }
+                    p.range[1] = c
+
+                    char_counter += p.range[1] - p.range[0]
+                    char_counter += count_code_points(p.content)
+
+                    p.unit = "text"
+                    p.range = `[${p.range[0]}:${p.range[1]}]`
+                }
+
+                var version = [peer + "-" + char_counter]
+
+                var parents = current_version
+                current_version = version
+                prev_state = new_state
+
+                braid_text.put(url, { version, parents, patches, peer })
+            })
+        }
+    }
+}
+
+function get_char_size(s, i) {
+    const charCode = s.charCodeAt(i)
+    return (charCode >= 0xd800 && charCode <= 0xdbff) ? 2 : 1
+}
+
+function count_code_points(str) {
+    let code_points = 0
+    for (let i = 0; i < str.length; i++) {
+        if (str.charCodeAt(i) >= 0xd800 && str.charCodeAt(i) <= 0xdbff) i++
+        code_points++
+    }
+    return code_points
+}
+
+async function braid_fetch_wrapper(url, params) {
+    if (!params.retry) throw "wtf"
+    var waitTime = 10
+    if (params.subscribe) {
+        var subscribe_handler = null
+        connect()
+        async function connect() {
+            if (params.signal?.aborted) return
+            try {
+                var c = await braid_fetch(url, { ...params, parents: await params.parents?.() })
+                c.subscribe((...args) => subscribe_handler?.(...args), on_error)
+                waitTime = 10
+            } catch (e) {
+                on_error(e)
+            }
+        }
+        function on_error(e) {
+            console.log(`eee[url:${url}] = ` + e.stack)
+            setTimeout(connect, waitTime)
+            waitTime = Math.min(waitTime * 2, 3000)
+        }
+        return { subscribe: handler => { subscribe_handler = handler } }
+    } else {
+        return new Promise((done) => {
+            send()
+            async function send() {
+                try {
+                    var res = await braid_fetch(url, params)
+                    if (res.status !== 200) throw "status not 200: " + res.status
+                    done(res)
+                } catch (e) {
+                    setTimeout(send, waitTime)
+                    waitTime = Math.min(waitTime * 2, 3000)
+                }
+            }
+        })
+    }
+}

package/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "braidfs",
+  "version": "0.0.12",
+  "description": "braid technology synchronizing files and webpages",
+  "author": "Braid Working Group",
+  "repository": "braid-org/braidfs",
+  "homepage": "https://braid.org",
+  "dependencies": {
+    "braid-http": "^0.3.20",
+    "braid-text": "^0.0.22",
+    "chokidar": "^3.6.0"
+  }
+}