braid-blob 0.0.30 → 0.0.32

package/AI-README.md

@@ -103,7 +103,7 @@ COMPARISON_RULES:
   1. Compare numeric length of timestamp
   2. If equal, lexicographic compare timestamp
   3. If equal, lexicographic compare full version string
-MERGE_TYPE: last-write-wins (lww)
+MERGE_TYPE: arbitrary-writer-wins (aww)
 ```
 
 ## METADATA_SCHEMA
@@ -145,7 +145,7 @@ SIDE_EFFECTS:
 VERSION_LOGIC:
   - If options.version provided: use options.version[0]
   - Else: generate "{peer}-{max(Date.now(), last_version_seq+1)}"
-  - Only write if new version > existing version (lww)
+  - Only write if new version > existing version (aww)
 ```
 
 ### get(key, options)
@@ -320,7 +320,7 @@ HTTP_HEADERS:
     Current-Version: "v1"            # for subscribed GET
     Editable: true
     Accept-Subscribe: true
-    Merge-Type: lww
+    Merge-Type: aww
     Content-Type: mime/type
 
 STATUS_CODES:
@@ -332,7 +332,7 @@ STATUS_CODES:
 
 BRAID_UPDATE_FORMAT:
   Version: "v1"\r\n
-  Merge-Type: lww\r\n
+  Merge-Type: aww\r\n
   Content-Length: N\r\n
   \r\n
   {body}

package/README.md

@@ -1,6 +1,6 @@
 # braid-blob
 
-A simple, self-contained library for synchronizing binary blobs (files, images, etc.) over HTTP using [Braid-HTTP](https://braid.org). It provides real-time synchronization with last-write-wins (LWW) conflict resolution and persistent storage.
+A simple, self-contained library for synchronizing binary blobs (files, images, etc.) over HTTP using [Braid-HTTP](https://braid.org). It provides real-time synchronization with arbitrary-writer-wins (AWW) conflict resolution and persistent storage.
 
 ## Quick Start
 

package/index.js

@@ -96,7 +96,7 @@ function create_braid_blob() {
                     if (peer !== options.peer)
                         sub.sendUpdate({
                             version: [meta.event],
-                            'Merge-Type': 'lww',
+                            'Merge-Type': 'aww',
                             body
                         })
         }
@@ -247,7 +247,7 @@ function create_braid_blob() {
             if (req.method === 'GET' || req.method === 'HEAD') {
                 if (!res.hasHeader("editable")) res.setHeader("Editable", "true")
                 if (!req.subscribe) res.setHeader("Accept-Subscribe", "true")
-                res.setHeader("Merge-Type", "lww")
+                res.setHeader("Merge-Type", "aww")
 
                 try {
                     var result = await braid_blob.get(options.key, {
@@ -267,7 +267,7 @@ function create_braid_blob() {
                         subscribe: req.subscribe ? (update) => {
                             res.sendUpdate({
                                 version: update.version,
-                                'Merge-Type': 'lww',
+                                'Merge-Type': 'aww',
                                 body: update.body
                             })
                         } : null
@@ -416,17 +416,6 @@ function create_braid_blob() {
                     }
 
                     // Remote -> local: subscribe to remote updates
-                    // We need both: remote_res (for Editable header) and local file exists
-                    var got_remote_res, got_local_file
-                    var remote_res_promise = new Promise(done => got_remote_res = done)
-                    var local_file_promise = new Promise(done => got_local_file = done)
-
-                    // Apply read-only once we have both remote response and local file
-                    Promise.all([remote_res_promise, local_file_promise]).then(async () => {
-                        var read_only = remote_res.headers?.get('editable') === 'false'
-                        await braid_blob.db.set_read_only(a, read_only)
-                    })
-
                     var b_ops = {
                         signal: ac.signal,
                         dont_retry: true,
@@ -435,7 +424,6 @@ function create_braid_blob() {
                                 version: update.version,
                                 content_type: update.headers?.['content-type']
                             })
-                            got_local_file()
                             remote_first_put()
                         },
                         on_error: handle_error
@@ -446,15 +434,11 @@ function create_braid_blob() {
                     }
 
                     // Set up both subscriptions, handling cases where one doesn't exist yet
-                    braid_blob.get(a, a_ops).then(x => {
-                        if (x) got_local_file()
-                        else remote_first_put_promise.then(() =>
-                            braid_blob.get(a, a_ops))
-                    })
+                    braid_blob.get(a, a_ops).then(x =>
+                        x || remote_first_put_promise.then(() =>
+                            braid_blob.get(a, a_ops)))
 
-                    // Get the response to check Editable header
                     var remote_res = await braid_blob.get(b, b_ops)
-                    if (remote_res) got_remote_res()
 
                     // If remote doesn't exist yet, wait for it to be created then reconnect
                     if (!remote_res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-blob",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "Library for collaborative blobs over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-blob",

package/test/tests.js

@@ -1147,101 +1147,6 @@ runTest(
     'shared content'
 )
 
-runTest(
-    "test sync readonly remote to nonexistent local",
-    async () => {
-        var local_key = 'test-sync-readonly-local-' + Math.random().toString(36).slice(2)
-        var remote_key = 'test-sync-readonly-remote-' + Math.random().toString(36).slice(2)
-
-        // Put something on the server first with Editable: false
-        var r1 = await braid_fetch(`/eval`, {
-            method: 'POST',
-            body: `void (async () => {
-                try {
-                    // Create a custom handler that sets Editable: false
-                    req.method = 'PUT'
-                    req.version = ['100']
-                    req.body = Buffer.from('readonly content')
-                    await braid_blob.put('${remote_key}', req.body, { version: req.version })
-                    res.end('created')
-                } catch (e) {
-                    res.end('error: ' + e.message + ' ' + e.stack)
-                }
-            })()`
-        })
-        var result = await r1.text()
-        if (result.startsWith('error:')) return result
-
-        // Now sync to a local key that doesn't exist, with a readonly remote
-        var r2 = await braid_fetch(`/eval`, {
-            method: 'POST',
-            body: `void (async () => {
-                try {
-                    var fs = require('fs').promises
-                    var test_id = 'test-sync-readonly-' + Math.random().toString(36).slice(2)
-                    var db_folder = __dirname + '/' + test_id + '-db'
-                    var meta_folder = __dirname + '/' + test_id + '-meta'
-
-                    var bb = braid_blob.create_braid_blob()
-                    bb.db_folder = db_folder
-                    bb.meta_folder = meta_folder
-
-                    // Create a mock server URL that returns Editable: false
-                    var http = require('http')
-                    var {http_server: braidify} = require('braid-http')
-
-                    var mock_server = http.createServer((req2, res2) => {
-                        braidify(req2, res2)
-                        res2.setHeader('Editable', 'false')
-                        braid_blob.serve(req2, res2, { key: '${remote_key}' })
-                    })
-
-                    await new Promise(resolve => mock_server.listen(0, resolve))
-                    var port = mock_server.address().port
-
-                    var remote_url = new URL('http://localhost:' + port + '/${remote_key}')
-                    var ac = new AbortController()
-
-                    // Start sync - local key doesn't exist yet
-                    bb.sync('${local_key}', remote_url, { signal: ac.signal })
-
-                    // Wait for sync to happen
-                    await new Promise(done => setTimeout(done, 500))
-
-                    // Stop sync
-                    ac.abort()
-                    mock_server.close()
-
-                    // Check if local file exists and has the content
-                    var result = await bb.get('${local_key}')
-
-                    var response
-                    if (!result) {
-                        response = 'file not created'
-                    } else if (result.body.toString() !== 'readonly content') {
-                        response = 'wrong content: ' + result.body.toString()
-                    } else {
-                        // Check if the file is actually read-only
-                        await bb.init()
-                        var is_readonly = await bb.db.is_read_only('${local_key}')
-                        response = is_readonly ? 'synced and readonly' : 'synced but NOT readonly'
-                    }
-
-                    // Clean up
-                    await fs.rm(db_folder, { recursive: true, force: true })
-                    await fs.rm(meta_folder, { recursive: true, force: true })
-
-                    res.end(response)
-                } catch (e) {
-                    res.end('error: ' + e.message + ' ' + e.stack)
-                }
-            })()`
-        })
-        return await r2.text()
-    },
-    'synced and readonly'
-)
-
 runTest(
     "test sync does not disconnect unnecessarily",
     async () => {