braid-blob 0.0.32 → 0.0.34

package/index.js

@@ -1,5 +1,6 @@
 var {http_server: braidify, fetch: braid_fetch} = require('braid-http'),
     {url_file_db} = require('url-file-db'),
+    fs = require('fs'),
     path = require('path')
 
 function create_braid_blob() {
@@ -7,9 +8,10 @@ function create_braid_blob() {
         db_folder: './braid-blob-db',
         meta_folder: './braid-blob-meta',
         cache: {},
+        meta_cache: {},
         key_to_subs: {},
         peer: null, // will be auto-generated if not set by the user
-        db: null // url-file-db instance with integrated meta storage
+        db: null // url-file-db instance
     }
 
     braid_blob.init = async () => {
@@ -19,16 +21,17 @@ function create_braid_blob() {
         await braid_blob.init()
 
         async function real_init() {
-            // Create url-file-db instance with integrated meta storage
+            // Ensure our meta folder exists
+            await fs.promises.mkdir(braid_blob.meta_folder, { recursive: true })
+
+            // Create a fake meta folder for url-file-db (we manage our own meta)
+            var fake_meta_folder = braid_blob.meta_folder + '-fake'
+            await fs.promises.mkdir(fake_meta_folder, { recursive: true })
+
+            // Create url-file-db instance (with fake meta folder - we manage our own)
             braid_blob.db = await url_file_db.create(
                 braid_blob.db_folder,
-                braid_blob.meta_folder,
-                async (db, key) => {
-                    // File changed externally, notify subscriptions
-                    // Use db parameter instead of braid_blob.db to avoid race condition
-                    var body = await db.read(key)
-                    await braid_blob.put(key, body, { skip_write: true })
-                }
+                fake_meta_folder
             )
 
             // establish a peer id if not already set
@@ -37,6 +40,37 @@ function create_braid_blob() {
         }
     }
 
+    function get_meta(key) {
+        if (braid_blob.meta_cache[key]) return braid_blob.meta_cache[key]
+        var meta_path = path.join(braid_blob.meta_folder, encode_filename(key))
+        try {
+            var data = fs.readFileSync(meta_path, 'utf8')
+            braid_blob.meta_cache[key] = JSON.parse(data)
+            return braid_blob.meta_cache[key]
+        } catch (e) {
+            if (e.code === 'ENOENT') return null
+            throw e
+        }
+    }
+
+    async function update_meta(key, updates) {
+        var meta = get_meta(key) || {}
+        Object.assign(meta, updates)
+        braid_blob.meta_cache[key] = meta
+        var meta_path = path.join(braid_blob.meta_folder, encode_filename(key))
+        await fs.promises.writeFile(meta_path, JSON.stringify(meta))
+    }
+
+    async function delete_meta(key) {
+        delete braid_blob.meta_cache[key]
+        var meta_path = path.join(braid_blob.meta_folder, encode_filename(key))
+        try {
+            await fs.promises.unlink(meta_path)
+        } catch (e) {
+            if (e.code !== 'ENOENT') throw e
+        }
+    }
+
     braid_blob.put = async (key, body, options = {}) => {
         // Handle URL case - make a remote PUT request
         if (key instanceof URL) {
@@ -59,8 +93,7 @@ function create_braid_blob() {
         await braid_blob.init()
         if (options.signal?.aborted) return
 
-        // Read the meta data using new meta API
-        var meta = braid_blob.db.get_meta(key) || {}
+        var meta = get_meta(key) || {}
 
         var their_e =
             !options.version ?
@@ -86,7 +119,7 @@ function create_braid_blob() {
             if (options.content_type)
                 meta_updates.content_type = options.content_type
 
-            await braid_blob.db.update_meta(key, meta_updates)
+            await update_meta(key, meta_updates)
             if (options.signal?.aborted) return
 
             // Notify all subscriptions of the update
@@ -134,8 +167,7 @@ function create_braid_blob() {
 
         await braid_blob.init()
 
-        // Read the meta data using new meta API
-        var meta = braid_blob.db.get_meta(key) || {}
+        var meta = get_meta(key) || {}
         if (meta.event == null) return null
 
         var result = {
@@ -217,8 +249,9 @@ function create_braid_blob() {
         await braid_blob.init()
         if (options.signal?.aborted) return
 
-        // Delete the file from the database
+        // Delete the file and its metadata
         await braid_blob.db.delete(key)
+        await delete_meta(key)
 
         // TODO: notify subscribers of deletion once we have a protocol for that
         // For now, just clean up the subscriptions
@@ -534,6 +567,35 @@ function create_braid_blob() {
         return false;
     }
 
+    function encode_filename(s) {
+        // Deal with case insensitivity
+        var bits = s.match(/\p{L}/ug).
+            map(c => +(c === c.toUpperCase())).join('')
+        var postfix = BigInt('0b0' + bits).toString(16)
+
+        // Swap ! and /
+        s = s.replace(/[\/!]/g, x => x === '/' ? '!' : '/')
+
+        // Encode characters that are unsafe on various filesystems:
+        //   < > : " / \ | ? *  - Windows restrictions
+        //   %                  - Reserved for encoding
+        //   \x00-\x1f, \x7f    - Control characters
+        s = s.replace(/[<>:"/|\\?*%\x00-\x1f\x7f]/g, encode_char)
+
+        // Deal with windows reserved words
+        if (s.match(/^(con|prn|aux|nul|com[1-9]|lpt[1-9])(\..*)?$/i))
+            s = s.slice(0, 2) + encode_char(s[2]) + s.slice(3)
+
+        // Deal with case insensitivity
+        s += '.' + postfix
+
+        return s
+
+        function encode_char(char) {
+            return '%' + char.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0')
+        }
+    }
+
     braid_blob.create_braid_blob = create_braid_blob
 
     return braid_blob

package/package.json

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

package/test/tests.js

@@ -1021,8 +1021,8 @@ runTest(
 runTest(
     "test sync two local keys",
     async () => {
-        var key1 = 'test-sync-local1-' + Math.random().toString(36).slice(2)
-        var key2 = 'test-sync-local2-' + Math.random().toString(36).slice(2)
+        var key1 = '/test-sync-local1-' + Math.random().toString(36).slice(2)
+        var key2 = '/test-sync-local2-' + Math.random().toString(36).slice(2)
 
         var r1 = await braid_fetch(`/eval`, {
             method: 'POST',
@@ -1049,7 +1049,7 @@ runTest(
         await new Promise(done => setTimeout(done, 100))
 
         // Check second key has the content
-        var r = await braid_fetch(`/${key2}`)
+        var r = await braid_fetch(`${key2}`)
         return await r.text()
     },
     'sync local content'
@@ -1058,11 +1058,11 @@ runTest(
 runTest(
     "test sync remote to local (swap)",
     async () => {
-        var local_key = 'test-sync-swap-local-' + Math.random().toString(36).slice(2)
-        var remote_key = 'test-sync-swap-remote-' + Math.random().toString(36).slice(2)
+        var local_key = '/test-sync-swap-local-' + Math.random().toString(36).slice(2)
+        var remote_key = '/test-sync-swap-remote-' + Math.random().toString(36).slice(2)
 
         // Put something on the server first
-        await braid_fetch(`/${remote_key}`, {
+        await braid_fetch(`${remote_key}`, {
             method: 'PUT',
             version: ['800'],
             body: 'remote content'
@@ -1073,7 +1073,7 @@ runTest(
             body: `void (async () => {
                 try {
                     var braid_blob = require(\`\${__dirname}/../index.js\`)
-                    var remote_url = new URL('http://localhost:' + req.socket.localPort + '/${remote_key}')
+                    var remote_url = new URL('http://localhost:' + req.socket.localPort + '${remote_key}')
 
                     // Start sync with URL as first argument (should swap internally)
                     braid_blob.sync(remote_url, '${local_key}')
@@ -1091,7 +1091,7 @@ runTest(
         await new Promise(done => setTimeout(done, 100))
 
         // Check local key has the remote content
-        var r = await braid_fetch(`/${local_key}`)
+        var r = await braid_fetch(`${local_key}`)
         return await r.text()
     },
     'remote content'
@@ -1365,7 +1365,7 @@ runTest(
                     bb2.db_folder = db_folder
                     bb2.meta_folder = meta_folder
 
-                    // This should NOT trigger a file change callback
+                    // Get the file from the new instance
                     var result2 = await bb2.get(test_key)
 
                     // Version should still be version-2, not regenerated
@@ -1461,95 +1461,6 @@ runTest(
     'true'
 )
 
-runTest(
-    "test that callback receives db parameter for use before assignment",
-    async () => {
-        var r1 = await braid_fetch(`/eval`, {
-            method: 'POST',
-            body: `void (async () => {
-                var fs = require('fs').promises
-                var test_id = 'test-callback-' + Math.random().toString(36).slice(2)
-                var db_folder = __dirname + '/' + test_id + '-db'
-                var meta_folder = __dirname + '/' + test_id + '-meta'
-
-                try {
-                    // Pre-create files that will trigger callback during init
-                    await fs.mkdir(db_folder, { recursive: true })
-                    await fs.mkdir(meta_folder, { recursive: true })
-
-                    // Write a file that exists before init
-                    await fs.writeFile(db_folder + '/pre-existing', 'old content')
-
-                    // Create metadata for it with old timestamp to trigger callback
-                    await fs.writeFile(meta_folder + '/!pre-existing', JSON.stringify({
-                        canonical_path: '/pre-existing',
-                        event: 'old-version',
-                        last_seen: Date.now() - 10000,
-                        mtime_ns: '1000000000000000'
-                    }))
-
-                    // Wait for files to be written
-                    await new Promise(resolve => setTimeout(resolve, 100))
-
-                    var callback_error = null
-                    var callback_called = false
-                    var db_was_null = false
-
-                    // Monkey-patch url_file_db.create to intercept callback
-                    var url_file_db_module = require('url-file-db').url_file_db
-                    var original_create = url_file_db_module.create
-
-                    url_file_db_module.create = async function(db_dir, meta_dir, callback) {
-                        var wrapped_callback = async function(db, key) {
-                            callback_called = true
-                            // Check if bb.db is null during callback
-                            if (!bb.db) {
-                                db_was_null = true
-                            }
-                            try {
-                                await callback(db, key)
-                            } catch (e) {
-                                callback_error = e.message
-                            }
-                        }
-                        return await original_create.call(this, db_dir, meta_dir, wrapped_callback)
-                    }
-
-                    var bb = braid_blob.create_braid_blob()
-                    bb.db_folder = db_folder
-                    bb.meta_folder = meta_folder
-
-                    // Init will trigger callback for pre-existing file
-                    // Callback tries to use braid_blob.db.read() but db not assigned yet
-                    await bb.init()
-
-                    // Restore
-                    url_file_db_module.create = original_create
-
-                    // Clean up
-                    await fs.rm(db_folder, { recursive: true, force: true })
-                    await fs.rm(meta_folder, { recursive: true, force: true })
-
-                    if (!callback_called) {
-                        res.end('callback was not called')
-                    } else if (callback_error) {
-                        res.end('callback error: ' + callback_error)
-                    } else {
-                        // Success: callback worked even if bb.db was null (using db param)
-                        res.end('true')
-                    }
-                } catch (e) {
-                    await fs.rm(db_folder, { recursive: true, force: true }).catch(() => {})
-                    await fs.rm(meta_folder, { recursive: true, force: true }).catch(() => {})
-                    res.end('error: ' + e.message)
-                }
-            })()`
-        })
-        return await r1.text()
-    },
-    'true'
-)
-
 runTest(
     "test get with URL returns null on 404",
     async () => {