braid-blob 0.0.34 → 0.0.35

package/index.js

@@ -1,5 +1,4 @@
 var {http_server: braidify, fetch: braid_fetch} = require('braid-http'),
-    {url_file_db} = require('url-file-db'),
     fs = require('fs'),
     path = require('path')
 
@@ -11,7 +10,7 @@ function create_braid_blob() {
         meta_cache: {},
         key_to_subs: {},
         peer: null, // will be auto-generated if not set by the user
-        db: null // url-file-db instance
+        db: null // object with read/write/delete methods
     }
 
     braid_blob.init = async () => {
@@ -24,15 +23,36 @@ function create_braid_blob() {
             // 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,
-                fake_meta_folder
-            )
+            // Set up db - either use provided object or create file-based storage
+            if (typeof braid_blob.db_folder === 'string') {
+                await fs.promises.mkdir(braid_blob.db_folder, { recursive: true })
+                braid_blob.db = {
+                    read: async (key) => {
+                        var file_path = path.join(braid_blob.db_folder, encode_filename(key))
+                        try {
+                            return await fs.promises.readFile(file_path)
+                        } catch (e) {
+                            if (e.code === 'ENOENT') return null
+                            throw e
+                        }
+                    },
+                    write: async (key, data) => {
+                        var file_path = path.join(braid_blob.db_folder, encode_filename(key))
+                        await fs.promises.writeFile(file_path, data)
+                    },
+                    delete: async (key) => {
+                        var file_path = path.join(braid_blob.db_folder, encode_filename(key))
+                        try {
+                            await fs.promises.unlink(file_path)
+                        } catch (e) {
+                            if (e.code !== 'ENOENT') throw e
+                        }
+                    }
+                }
+            } else {
+                // db_folder is already an object with read/write/delete
+                braid_blob.db = braid_blob.db_folder
+            }
 
             // establish a peer id if not already set
             if (!braid_blob.peer)
@@ -264,7 +284,7 @@ function create_braid_blob() {
 
         if (!options.key) {
             var url = new URL(req.url, 'http://localhost')
-            options.key = url_file_db.get_canonical_path(url.pathname)
+            options.key = url.pathname
         }
 
         braidify(req, res)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-blob",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "Library for collaborative blobs over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-blob",
@@ -10,7 +10,6 @@
     "test:browser": "node test/test.js --browser"
   },
   "dependencies": {
-    "braid-http": "~1.3.83",
-    "url-file-db": "^0.0.25"
+    "braid-http": "~1.3.83"
   }
 }

package/test/tests.js

@@ -1419,7 +1419,7 @@ runTest(
                     var result1 = await bb1.get(test_key)
 
                     // Check what metadata was saved
-                    var meta1 = bb1.db.get_meta(test_key)
+                    var meta1 = bb1.meta_cache[test_key]
                     var debug_info = 'meta1: ' + JSON.stringify(meta1) + '; '
 
                     // Wait a bit to ensure file system has settled
@@ -1435,7 +1435,7 @@ runTest(
                     var result2 = await bb2.get(test_key)
 
                     // Check what metadata bb2 sees
-                    var meta2 = bb2.db.get_meta(test_key)
+                    var meta2 = bb2.meta_cache[test_key]
                     debug_info += 'meta2: ' + JSON.stringify(meta2) + '; '
 
                     // The version should be the same - no new event ID generated