braid-text 0.2.28 → 0.2.29

package/index.js

@@ -1,5 +1,5 @@
 
-let { Doc, OpLog, Branch } = require("diamond-types-node")
+let { Doc, OpLog, Branch } = require("./dt.js")
 let braidify = require("braid-http").http_server
 let fs = require("fs")
 

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "braid-text",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",
   "homepage": "https://braid.org",
   "dependencies": {
-    "diamond-types-node": "^1.0.2",
     "braid-http": "^1.3.74"
   }
 }

package/test/test.js

@@ -1,580 +0,0 @@
-
-let { Doc } = require("diamond-types-node")
-let braid_text = require('../index.js')
-let {dt_get, dt_get_patches, dt_parse, dt_create_bytes, dt_get_local_version, RangeSet} = braid_text
-
-process.on("unhandledRejection", (x) =>
-    console.log(`unhandledRejection: ${x.stack ?? x}`)
-)
-process.on("uncaughtException", (x) =>
-    console.log(`uncaughtException: ${x.stack ?? x}`)
-)
-
-braid_text.db_folder = null
-
-async function test_db() {
-    braid_text.db_folder = './braid-text-db'
-    var key = Math.random().toString(36).slice(2)
-    await braid_text.put(key, {version: ['a-0'], body: 'A'})
-    await braid_text.put(key, {version: ['a-2'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'B'}]})
-    delete braid_text.cache[key]
-    var {version, body} = await braid_text.get(key, {})
-
-    if (body != 'AB') throw new Error('db error')
-
-    braid_text.db_folder = null
-}
-
-async function test_dt_get_local_version() {
-    for (var tt = 0; tt < 100; tt++) {
-        var st = Date.now()
-
-        var doc = new Doc('x')
-        var n = 100
-        var v_array = []
-        var p_array = []
-        var agents = ['hi']
-        var agent_rangesets = {}
-
-        for (var i = 0; i < n; i++) {
-            // console.log(`i = ${i}`)
-
-            // Math.randomSeed('seed::::' + i)
-
-            var agent = agents[0]
-
-            var seq = null
-            if (!agent_rangesets[agent]) agent_rangesets[agent] = new RangeSet()
-            var ranges = agent_rangesets[agent].ranges
-            if (!ranges.length) {
-                seq = Math.floor(Math.random() * 10)
-            } else {
-                var ii
-                if (ranges[0]?.[0] === 0)
-                    ii = Math.floor(Math.random() * ranges.length)
-                else
-                    ii = Math.floor(Math.random() * (ranges.length + 1)) - 1
-                var low = ii < 0 ? 0 : ranges[ii][1] + 1
-                var high = ii + 1 < ranges.length ? ranges[ii + 1][0] - 1 : ranges[ii][1] + 10
-                seq = Math.random() < 0.8 ? low : low + Math.floor(Math.random() * (high - low + 1))
-            }
-            agent_rangesets[agent].add_range(seq, seq)
-            v_array.push(`${agent}-${seq}`)
-
-            var parents = []
-            var shadow = new Set()
-            if (p_array.length) {
-                var starting_point = Math.floor(Math.random() * p_array.length)
-                parents.push(starting_point)
-                for (var p of p_array[starting_point]) shadow.add(p)
-                for (var ii = starting_point - 1; ii >= 0 && Math.random() < 0.9; ii--) {
-                    if (!shadow.has(ii) && Math.random() < 0.5) {
-                        parents.push(ii)
-                        shadow.add(ii)
-                    }
-                    if (shadow.has(ii))
-                        for (var p of p_array[ii])
-                            shadow.add(p)
-                }
-            }
-            p_array.push(parents)
-            parents = parents.map(p => v_array[p])
-        
-            let args = [`${agent}-${seq}`, parents, 0, 0, 'x']
-            // console.log(args)
-
-            doc.mergeBytes(dt_create_bytes(...args))
-        }
-
-        var bytes = doc.toBytes()
-
-        for (var t = 0; t < 100; t++) {
-            // if (t % 10 === 0) console.log(`  t = ${t}`)
-
-            var version = []
-            var vv_array = [...v_array]
-            while (!version.length || (vv_array.length && Math.random() < 0.9)) {
-                version.push(vv_array.splice(Math.floor(Math.random() * vv_array.length), 1)[0])
-            }
-
-            var local_new = dt_get_local_version(bytes, version)
-            var local_old = old_dt_get_local_version(bytes, version)
-
-            if (local_new.some((x, i) => x != local_old[i])) {
-                throw new Error('bad!')
-            }
-        }
-
-        console.log(`[tt=${tt}] total T = ${Date.now() - st}`)
-    }
-}
-
-function old_dt_get_local_version(bytes, version) {
-    var [_agents, versions, _parentss] = dt_parse([...bytes])
-
-    var frontier = new Set(version)
-
-    var local_version = []
-    for (var i = 0; i < versions.length; i++) {
-        var v = versions[i].join("-")
-        if (frontier.has(v)) {
-            local_version.push(i)
-            frontier.delete(v)
-        }
-    }
-
-    if (frontier.size) throw new Error(`version not found: ${version}`)
-
-    return local_version
-}
-
-async function main() {
-    let best_seed = NaN
-    let best_n = Infinity
-    let base = Math.floor(Math.random() * 10000000)
-    let st = Date.now()
-
-    await test_dt_get_local_version()
-
-    await test_db()
-
-    let og_log = console.log
-    console.log = () => {}
-    for (let t = 0; t < 10000; t++) {
-        let seed = base + t
-    // for (let t = 0; t < 1; t++) {
-    //     let seed = 403279
-
-        og_log(`t = ${t}, seed = ${seed}, best_n = ${best_n} @ ${best_seed}`)
-        Math.randomSeed(seed)
-
-        let n = Math.floor(Math.random() * 15)
-        console.log(`n = ${n}`)
-
-        try {
-            // create a bunch of edits called doc,
-            // and remember a point along the way of adding all these edits,
-            // called middle_doc
-            let doc = new Doc('server')
-            let middle_doc = null
-
-            if (!middle_doc && (Math.random() < 1/n || n == 0))
-                middle_doc = Doc.fromBytes(doc.toBytes())
-            for (let i = 0; i < n; i++) {
-                console.log(`edit ${i}`)
-
-                make_random_edit(doc)
-                if (!middle_doc && (Math.random() < 1/n || i == n - 1))
-                    middle_doc = Doc.fromBytes(doc.toBytes())
-            }
-            if (!middle_doc) throw new Error('bad')
-
-            // put them into braid-text
-            let dt_to_braid = async (doc, key) => {
-                await braid_text.get(key, {})
-                for (let x of dt_get_patches(doc)) {
-                    var resource = await braid_text.get_resource(key)
-                    var [actor, seq] = braid_text.decode_version(x.version)
-                    var old_text = await braid_text.get(key)
-
-                    console.log(`x = `, x)
-                    let y = {
-                        merge_type: 'dt',
-                        version: [x.version],
-                        parents: x.parents,
-                        patches: [{
-                            unit: x.unit,
-                            range: x.range,
-                            content: x.content
-                        }]
-                    }
-                    await braid_text.put(key, y)
-                    y.validate_already_seen_versions = true
-                    await braid_text.put(key, y)
-                }
-            }
-            await dt_to_braid(doc, 'doc')
-            await dt_to_braid(middle_doc, 'middle_doc')
-            console.log(`doc dt = ${doc.get()}`)
-            console.log(`middle_doc dt = ${middle_doc.get()}`)
-            console.log(`doc = ${await braid_text.get('doc')}`)
-            console.log(`middle_doc = ${await braid_text.get('middle_doc')}`)
-
-            // ensure they look right
-            if (doc.get() != await braid_text.get('doc')) throw new Error('bad')
-            if (middle_doc.get() != await braid_text.get('middle_doc')) throw new Error('bad')
-
-            // test getting old version
-            let middle_v = middle_doc.getRemoteVersion().map(x => x.join('-'))
-            console.log(`middle_doc = ${await braid_text.get('middle_doc')}`)
-            console.log(`middle_v = `, middle_v)
-            
-            let doc_v = doc.getRemoteVersion().map(x => x.join('-'))
-            console.log(`doc_v = `, doc_v)
-
-            console.log(`doc = `, await braid_text.get('doc', {version: middle_v}))
-            if (await braid_text.get('middle_doc') != (await braid_text.get('doc', {version: middle_v})).body) throw new Error('bad')
-
-            // test simplton
-            var first_time = true
-            await new Promise(async (done, fail) => {
-                await braid_text.get('middle_doc', {peer: 'sim', subscribe: async update => {
-                    if (first_time) {
-                        first_time = false
-                        if (update.body !== await braid_text.get('middle_doc')) fail(new Error('simpleton fail'))
-                        done()
-                    }
-                }})
-            })
-
-            // test handler on dt
-            braid_text.get('middle_doc', {merge_type: 'dt', subscribe: async update => {}})
-
-            // try getting updates from middle_doc to doc
-            let o = {merge_type: 'dt', parents: middle_v, subscribe: update => {
-                braid_text.put('middle_doc', update)
-            }}
-            await braid_text.get('doc', o)
-            await braid_text.forget('doc', o)
-
-            if (await braid_text.get('middle_doc') != await braid_text.get('doc')) throw new Error('bad')
-
-            doc.free()
-            middle_doc.free()
-            for (let p of Object.values(braid_text.cache))
-                (await p).doc.free()
-            braid_text.cache = {}
-        } catch (e) {
-            if (console.log == og_log) throw e
-            if (n < best_n) {
-                best_n = n
-                best_seed = seed
-            }
-        }
-    }
-    og_log(`best_seed = ${best_seed}, best_n = ${best_n}`)
-    og_log(`time = ${Date.now() - st}`)
-}
-
-function make_random_edit(doc) {
-    let [agents, versions, _parentss] = dt_parse([...doc.toBytes()])
-
-    let agent = (agents.length && Math.random() > 0.5) ?
-        agents[Math.floor(Math.random() * agents.length)] :
-        Math.random().toString(36).slice(2)
-
-    let include_versions = []
-    let base_seq = -1
-    for (let i = 0; i < versions.length; i++) {
-        let [a, seq] = versions[i]
-        if (a == agent || Math.random() > 0.5) {
-            include_versions.push(a + '-' + seq)
-            if (a == agent && seq > base_seq) base_seq = seq
-        }
-    }
-    base_seq++
-
-    // try skipping some seqs.. to see if it breaks..
-    base_seq += Math.floor(Math.random() * 5)
-
-    console.log({agents, versions, include_versions})
-
-    let parent_doc = dt_get(doc, include_versions)
-
-    let parents = parent_doc.getRemoteVersion().map(x => x.join('-'))
-
-    let len = parent_doc.len()
-    console.log(`len = ${len}`)
-
-    parent_doc.free()
-
-    if (len && Math.random() > 0.5) {
-        // delete
-        let start = Math.floor(Math.random() * len)
-        let del_len = Math.floor(Math.random() * (len - start - 1)) + 1
-
-        let args = [`${agent}-${base_seq}`, parents, start, del_len, null]
-        console.log(args)
-        doc.mergeBytes(dt_create_bytes(...args))
-    } else {
-        // insert
-        let start = Math.floor(Math.random() * (len + 1))
-        let ins = Array(Math.floor(Math.random() * 10) + 1).fill(0).map(() => getRandomCharacter()).join('')
-       
-        let args = [`${agent}-${base_seq}`, parents, start, 0, ins]
-        console.log(args)
-        doc.mergeBytes(dt_create_bytes(...args))
-    }
-
-    // work here
-    console.log(`doc => ${doc.get()}`)
-}
-
-//////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////
-
-function getRandomCharacter() {
-    const characters = [
-        // ASCII characters
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-        'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-        'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '-', '_', '+', '=',
-
-        // Unicode characters (each is a single code point)
-        'α', 'β', 'γ', 'δ', 'ε', 'ζ', 'η', 'θ', // Greek letters
-        '零', '一', '二', '三', '四', '五', '六', '七', // Chinese numerals
-        '☀', '☁', '☂', '☃', '☄', '★', '☆', '☇', // Miscellaneous symbols
-        '🌈', '🌞', '🌝', '🌚', '🌕', '🌖', '🌗', '🌘', // Emoji (may be multiple UTF-16 units)
-        'Ω', 'π', '∑', '√', '∫', '∀', '∂', '∃', // Mathematical symbols
-        'あ', 'い', 'う', 'え', 'お', 'か', 'き', 'く', // Japanese Hiragana
-        'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', // Arabic letters
-    ];
-
-    const randomIndex = Math.floor(Math.random() * characters.length);
-    return characters[randomIndex];
-}
-
-/////////
-
-// the next two functions added by me
-
-function create_rand(seed) {
-    if (typeof (seed) == 'string') {
-        var t = new MersenneTwister(0)
-        var a = []
-        for (var i = 0; i < seed.length; i++)
-            a[i] = seed.charCodeAt(i)
-        t.init_by_array(a, a.length)
-    } else if (typeof (seed) == 'number') {
-        var t = new MersenneTwister(seed)
-    } else {
-        var t = new MersenneTwister()
-    }
-    return () => t.random()
-}
-
-Math.randomSeed = function (seed) {
-    var r = create_rand(seed)
-    Math.random = () => r()
-}
-
-/* The following piece of code is an implementation of MersenneTwister object
-   taken from https://gist.github.com/banksean/300494, with one method 
-   xor_array(array, size) added.
-*/
-
-/*
-  I've wrapped Makoto Matsumoto and Takuji Nishimura's code in a namespace
-  so it's better encapsulated. Now you can have multiple random number generators
-  and they won't stomp all over eachother's state.
-  
-  If you want to use this as a substitute for Math.random(), use the random()
-  method like so:
-  
-  var m = new MersenneTwister();
-  var randomNumber = m.random();
-  
-  You can also call the other genrand_{foo}() methods on the instance.
-
-  If you want to use a specific seed in order to get a repeatable random
-  sequence, pass an integer into the constructor:
-
-  var m = new MersenneTwister(123);
-
-  and that will always produce the same random sequence.
-
-  Sean McCullough (banksean@gmail.com)
-*/
-
-/* 
-   A C-program for MT19937, with initialization improved 2002/1/26.
-   Coded by Takuji Nishimura and Makoto Matsumoto.
- 
-   Before using, initialize the state by using init_genrand(seed)  
-   or init_by_array(init_key, key_length).
- 
-   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-   All rights reserved.                          
- 
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
- 
-     1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
- 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
- 
-     3. The names of its contributors may not be used to endorse or promote 
-        products derived from this software without specific prior written 
-        permission.
- 
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- 
-   Any feedback is very welcome.
-   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
-   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
-*/
-
-var MersenneTwister = function (seed) {
-    if (seed == undefined) {
-        seed = new Date().getTime();
-    }
-    /* Period parameters */
-    this.N = 624;
-    this.M = 397;
-    this.MATRIX_A = 0x9908b0df;   /* constant vector a */
-    this.UPPER_MASK = 0x80000000; /* most significant w-r bits */
-    this.LOWER_MASK = 0x7fffffff; /* least significant r bits */
-
-    this.mt = new Array(this.N); /* the array for the state vector */
-    this.mti = this.N + 1; /* mti==N+1 means mt[N] is not initialized */
-
-    this.init_genrand(seed);
-}
-
-/* initializes mt[N] with a seed */
-MersenneTwister.prototype.init_genrand = function (s) {
-    this.mt[0] = s >>> 0;
-    for (this.mti = 1; this.mti < this.N; this.mti++) {
-        var s = this.mt[this.mti - 1] ^ (this.mt[this.mti - 1] >>> 30);
-        this.mt[this.mti] = (((((s & 0xffff0000) >>> 16) * 1812433253) << 16) + (s & 0x0000ffff) * 1812433253)
-            + this.mti;
-        /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
-        /* In the previous versions, MSBs of the seed affect   */
-        /* only MSBs of the array mt[].                        */
-        /* 2002/01/09 modified by Makoto Matsumoto             */
-        this.mt[this.mti] >>>= 0;
-        /* for >32 bit machines */
-    }
-}
-
-/* initialize by an array with array-length */
-/* init_key is the array for initializing keys */
-/* key_length is its length */
-/* slight change for C++, 2004/2/26 */
-MersenneTwister.prototype.init_by_array = function (init_key, key_length) {
-    var i, j, k;
-    this.init_genrand(19650218);
-    i = 1; j = 0;
-    k = (this.N > key_length ? this.N : key_length);
-    for (; k; k--) {
-        var s = this.mt[i - 1] ^ (this.mt[i - 1] >>> 30)
-        this.mt[i] = (this.mt[i] ^ (((((s & 0xffff0000) >>> 16) * 1664525) << 16) + ((s & 0x0000ffff) * 1664525)))
-            + init_key[j] + j; /* non linear */
-        this.mt[i] >>>= 0; /* for WORDSIZE > 32 machines */
-        i++; j++;
-        if (i >= this.N) { this.mt[0] = this.mt[this.N - 1]; i = 1; }
-        if (j >= key_length) j = 0;
-    }
-    for (k = this.N - 1; k; k--) {
-        var s = this.mt[i - 1] ^ (this.mt[i - 1] >>> 30);
-        this.mt[i] = (this.mt[i] ^ (((((s & 0xffff0000) >>> 16) * 1566083941) << 16) + (s & 0x0000ffff) * 1566083941))
-            - i; /* non linear */
-        this.mt[i] >>>= 0; /* for WORDSIZE > 32 machines */
-        i++;
-        if (i >= this.N) { this.mt[0] = this.mt[this.N - 1]; i = 1; }
-    }
-
-    this.mt[0] = 0x80000000; /* MSB is 1; assuring non-zero initial array */
-}
-
-/* XORs the mt array with a given array xor_key of length key_length */
-MersenneTwister.prototype.xor_array = function (xor_key, key_length) {
-    var i, j;
-    j = 0;
-    for (i = 0; i < this.N; i++) {
-        this.mt[i] ^= xor_key[j];
-        this.mt[i] >>>= 0;
-        j++;
-        if (j >= key_length) j = 0;
-    }
-}
-
-/* generates a random number on [0,0xffffffff]-interval */
-MersenneTwister.prototype.genrand_int32 = function () {
-    var y;
-    var mag01 = new Array(0x0, this.MATRIX_A);
-    /* mag01[x] = x * MATRIX_A  for x=0,1 */
-
-    if (this.mti >= this.N) { /* generate N words at one time */
-        var kk;
-
-        if (this.mti == this.N + 1)   /* if init_genrand() has not been called, */
-            this.init_genrand(5489); /* a default initial seed is used */
-
-        for (kk = 0; kk < this.N - this.M; kk++) {
-            y = (this.mt[kk] & this.UPPER_MASK) | (this.mt[kk + 1] & this.LOWER_MASK);
-            this.mt[kk] = this.mt[kk + this.M] ^ (y >>> 1) ^ mag01[y & 0x1];
-        }
-        for (; kk < this.N - 1; kk++) {
-            y = (this.mt[kk] & this.UPPER_MASK) | (this.mt[kk + 1] & this.LOWER_MASK);
-            this.mt[kk] = this.mt[kk + (this.M - this.N)] ^ (y >>> 1) ^ mag01[y & 0x1];
-        }
-        y = (this.mt[this.N - 1] & this.UPPER_MASK) | (this.mt[0] & this.LOWER_MASK);
-        this.mt[this.N - 1] = this.mt[this.M - 1] ^ (y >>> 1) ^ mag01[y & 0x1];
-
-        this.mti = 0;
-    }
-
-    y = this.mt[this.mti++];
-
-    /* Tempering */
-    y ^= (y >>> 11);
-    y ^= (y << 7) & 0x9d2c5680;
-    y ^= (y << 15) & 0xefc60000;
-    y ^= (y >>> 18);
-
-    return y >>> 0;
-}
-
-/* generates a random number on [0,0x7fffffff]-interval */
-MersenneTwister.prototype.genrand_int31 = function () {
-    return (this.genrand_int32() >>> 1);
-}
-
-/* generates a random number on [0,1]-real-interval */
-MersenneTwister.prototype.genrand_real1 = function () {
-    return this.genrand_int32() * (1.0 / 4294967295.0);
-    /* divided by 2^32-1 */
-}
-
-/* generates a random number on [0,1)-real-interval */
-MersenneTwister.prototype.random = function () {
-    return this.genrand_int32() * (1.0 / 4294967296.0);
-    /* divided by 2^32 */
-}
-
-/* generates a random number on (0,1)-real-interval */
-MersenneTwister.prototype.genrand_real3 = function () {
-    return (this.genrand_int32() + 0.5) * (1.0 / 4294967296.0);
-    /* divided by 2^32 */
-}
-
-/* generates a random number on [0,1) with 53-bit resolution*/
-MersenneTwister.prototype.genrand_res53 = function () {
-    var a = this.genrand_int32() >>> 5, b = this.genrand_int32() >>> 6;
-    return (a * 67108864.0 + b) * (1.0 / 9007199254740992.0);
-}
-
-/* These real versions are due to Isaku Wada, 2002/01/09 added */
-
-////////////////////////////////////////////////////////////////////
-main()