braid-blob 0.0.10 → 0.0.12

package/index.js

@@ -5,6 +5,7 @@ var {http_server: braidify, free_cors} = require('braid-http'),
 
 var braid_blob = {
     db_folder: './braid-blob-db',
+    meta_folder: './braid-blob-meta',
     cache: {}
 }
 
@@ -24,23 +25,34 @@ braid_blob.serve = async (req, res, options = {}) => {
 
     await within_fiber(options.key, async () => {
         const filename = `${braid_blob.db_folder}/${encode_filename(options.key)}`
+        const metaname = `${braid_blob.meta_folder}/${encode_filename(options.key)}`
         
+        // Read the meta file
+        var meta = {}
         try {
-            var our_v = Math.round((await fs.promises.stat(filename)).mtimeMs)
+            meta = JSON.parse(await fs.promises.readFile(metaname, 'utf8'))
         } catch (e) {}
+        var our_v = meta.version
 
         if (req.method === 'GET') {
             // Handle GET request for binary files
 
+            if (our_v == null) {
+                res.statusCode = 404
+                return res.end('')
+            }
+
             // Set Version header;
             //   but if this is a subscription,
             //     then we set Current-Version instead
-            res.setHeader((req.subscribe ? 'Current-' : '') + 'Version',
-                our_v != null ? `"${our_v}"` : '')
+            res.setHeader((req.subscribe ? 'Current-' : '') + 'Version', `"${our_v}"`)
+            
+            // Set Content-Type
+            if (meta.content_type)
+                res.setHeader('Content-Type', meta.content_type)
                 
             if (!req.subscribe)
-                return res.end(our_v != null ?
-                    await fs.promises.readFile(filename) : '')
+                return res.end(await fs.promises.readFile(filename))
 
             if (!res.hasHeader("editable"))
                 res.setHeader("Editable", "true")
@@ -58,12 +70,11 @@ braid_blob.serve = async (req, res, options = {}) => {
 
 
             // Send an immediate update when:
-            if (!req.parents ||              // 1) They have no version history
-                                             //    (need full sync)
-                (our_v != null && (          // 2) We have a version AND...
-                    !req.parents.length ||   //    a) Their version is the empty set
-                    our_v > 1*req.parents[0] //    b) Our version is newer
-                )))
+            if (!req.parents ||          // 1) They have no version history
+                                         //    (need full sync)
+                !req.parents.length ||   // 2) Or their version is the empty set
+                our_v > 1*req.parents[0] // 3) Or our version is newer
+                )
                 return res.sendUpdate({
                     version: our_v != null ? ['' + our_v] : [],
                     body: our_v != null ? await fs.promises.readFile(filename) : ''
@@ -74,6 +85,7 @@ braid_blob.serve = async (req, res, options = {}) => {
 
             // Ensure directory exists
             await fs.promises.mkdir(path.dirname(filename), { recursive: true })
+            await fs.promises.mkdir(path.dirname(metaname), { recursive: true })
 
             var their_v =
                 !req.version ?
@@ -88,7 +100,12 @@ braid_blob.serve = async (req, res, options = {}) => {
 
                 // Write the file
                 await fs.promises.writeFile(filename, body)
-                await fs.promises.utimes(filename, new Date(), new Date(their_v))
+
+                // Write the meta file
+                meta.version = their_v
+                if (req.headers['content-type'])
+                    meta.content_type = req.headers['content-type']
+                await fs.promises.writeFile(metaname, JSON.stringify(meta))
 
                 // Notify all subscriptions of the update
                 // (except the peer which made the PUT request itself)
@@ -102,6 +119,15 @@ braid_blob.serve = async (req, res, options = {}) => {
                 res.setHeader("Version", our_v != null ? `"${our_v}"` : '')
             }
             res.end('')
+        } else if (req.method === 'DELETE') {
+            try {
+                await fs.promises.unlink(filename)
+            } catch (e) {}
+            try {
+                await fs.promises.unlink(metaname)
+            } catch (e) {}
+            res.statusCode = 204 // No Content
+            res.end('')
         }
     })
 }

package/package.json

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

package/server-demo.js

@@ -15,7 +15,7 @@ var server = require("http").createServer(async (req, res) => {
 
 server.listen(port, () => {
     console.log(`server started on port ${port}`)
-    console.log(`files stored in: ${braid_blob.storage_base}`)
+    console.log(`files stored in: ${braid_blob.db_folder}`)
 })
 
 // curl -X PUT --data-binary @image.png http://localhost:8888/image.png