braid-blob 0.0.11 → 0.0.13

package/index.js

@@ -37,19 +37,30 @@ braid_blob.serve = async (req, res, options = {}) => {
         if (req.method === 'GET') {
             // Handle GET request for binary files
 
+            if (our_v == null) {
+                res.statusCode = 404
+                res.setHeader('Content-Type', 'text/plain')
+                return res.end('File Not Found')
+            }
+
+            if (meta.content_type && req.headers.accept &&
+                !isAcceptable(meta.content_type, req.headers.accept)) {
+                res.statusCode = 406
+                res.setHeader('Content-Type', 'text/plain')
+                return res.end(`Content-Type of ${meta.content_type} not in Accept: ${req.headers.accept}`)
+            }
+
             // 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")
@@ -67,12 +78,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) : ''
@@ -117,6 +127,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('')
         }
     })
 }
@@ -153,4 +172,32 @@ async function slurp(req) {
     })
 }
 
+function isAcceptable(contentType, acceptHeader) {
+    // If no Accept header or Accept is */*, accept everything
+    if (!acceptHeader || acceptHeader === '*/*') return true;
+    
+    // Parse the Accept header into individual media types
+    const acceptTypes = acceptHeader.split(',').map(type => type.trim());
+    
+    for (const acceptType of acceptTypes) {
+        // Remove quality values (e.g., "text/html;q=0.9" -> "text/html")
+        const cleanAcceptType = acceptType.split(';')[0].trim();
+        
+        // Exact match
+        if (cleanAcceptType === contentType) return true;
+        
+        // Wildcard subtype match (e.g., "image/*" matches "image/png")
+        if (cleanAcceptType.endsWith('/*')) {
+            const acceptMain = cleanAcceptType.slice(0, -2);
+            const contentMain = contentType.split('/')[0];
+            if (acceptMain === contentMain) return true;
+        }
+        
+        // Full wildcard
+        if (cleanAcceptType === '*/*') return true;
+    }
+    
+    return false;
+}
+
 module.exports = braid_blob

package/package.json

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