braid-text 0.2.6 → 0.2.8

package/README.md

@@ -35,7 +35,7 @@ Now open these URLs in your browser:
 
 Or try opening the URL in [Braid-Chrome](https://github.com/braid-org/braid-chrome), or [another Braid client](https://bloop.monster/simpleditor), to edit it directly!
 
-Check out the `server-demo.js` file to see examples for how to add access control, and a `/pages` endpoint to show all the edited pages.
+Check out the `server-demo.js` file to see examples for how to add simple access control, where a user need only enter a password into a cookie in the javascript console like: `document.cookie = 'password'`; and a `/pages` endpoint to show all the edited pages.
 
 ## General Use on Server
 

package/index.js

@@ -1,5 +1,5 @@
 
-let { Doc } = require("diamond-types-node")
+let { Doc, OpLog, Branch } = require("diamond-types-node")
 let braidify = require("braid-http").http_server
 let fs = require("fs")
 
@@ -349,15 +349,8 @@ braid_text.put = async (key, options) => {
     let parents = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
     let og_parents = options_parents || parents
 
-    function get_len() {
-        let d = dt_get(resource.doc, og_parents)
-        let len = d.len()
-        d.free()
-        return len
-    }
-
     let max_pos = resource.length_cache.get('' + og_parents) ??
-        (v_eq(parents, og_parents) ? resource.doc.len() : get_len())
+        (v_eq(parents, og_parents) ? resource.doc.len() : dt_len(resource.doc, og_parents))
     
     if (body != null) {
         patches = [{
@@ -825,6 +818,27 @@ async function file_sync(key, process_delta, get_init) {
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 
+function dt_len(doc, version) {
+    let bytes = doc.toBytes()
+    let oplog = OpLog.fromBytes(bytes)
+    let [_agents, versions, _parentss] = dt_parse([...bytes])
+
+    let frontier = {}
+    version.forEach((x) => frontier[x] = true)
+
+    let local_version = []
+    for (let i = 0; i < versions.length; i++)
+        if (frontier[versions[i].join("-")]) local_version.push(i)
+
+    let b = new Branch()
+    b.merge(oplog, new Uint32Array(local_version))
+    let len = count_code_points(b.get())
+    b.free()
+    
+    oplog.free()
+    return len
+}
+
 function dt_get(doc, version, agent = null) {
     if (dt_get.last_doc) dt_get.last_doc.free()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-text",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braidjs",

package/server-demo.js

@@ -77,22 +77,14 @@ var server = require("http").createServer(async (req, res) => {
     //     return
     // }
 
-    // TODO: uncomment and change admin_pass above,
-    // and uncomment out the code below to add basic access control
+    // TODO: uncomment out the code below to add basic access control,
+    // where a user logs in by openning the javascript console
+    // and entering: document.cookie = 'fake_password'
     // 
     // var admin_pass = "fake_password"
-    //
-    // if (req.url === '/login_' + admin_pass) {
-    //     res.writeHead(200, {
-    //         "Content-Type": "text/plain",
-    //         "Set-Cookie": `admin_pass=${admin_pass}; Path=/`,
-    //     });
-    //     res.end("Logged in successfully");
-    //     return;
-    // }
-    //
+    // 
     // if (req.method == "PUT" || req.method == "POST" || req.method == "PATCH") {
-    //     if (!req.headers.cookie?.includes(`admin_pass=${admin_pass}`)) {
+    //     if (!req.headers.cookie?.split(/;/).map(x => x.trim()).some(x => x === admin_pass)) {
     //         console.log("Blocked PUT:", { cookie: req.headers.cookie })
     //         res.statusCode = 401
     //         return res.end()