hypercore-fetch 9.5.0 → 9.6.0

package/index.js

@@ -367,6 +367,8 @@ export default async function makeHyperFetch ({
       return { status: 403, body: `Cannot PUT file to read-only drive: ${drive.url}`, headers: { Location: request.url } }
     }
 
+    const mtime = Date.now()
+
     if (isFormData) {
       // It's a form! Get the files out and process them
       const formData = await request.formData()
@@ -377,7 +379,7 @@ export default async function makeHyperFetch ({
           Readable.from(data.stream()),
           drive.createWriteStream(filePath, {
             metadata: {
-              mtime: Date.now()
+              mtime
             }
           })
         )
@@ -390,18 +392,31 @@ export default async function makeHyperFetch ({
           Readable.from(request.body),
           drive.createWriteStream(pathname, {
             metadata: {
-              mtime: Date.now()
+              mtime
             }
           })
         )
       }
     }
 
-    return { status: 201, headers: { Location: request.url } }
+    const fullURL = new URL(pathname, drive.url).href
+
+    const headers = {
+      Location: request.url,
+      ETag: `${drive.version}`,
+      Link: `<${fullURL}>; rel="canonical"`,
+      [HEADER_LAST_MODIFIED]: isFormData ? undefined : new Date(mtime).toUTCString()
+    }
+
+    return { status: 201, headers }
   }
 
   function putFilesVersioned (request) {
-    return { status: 405, body: 'Cannot PUT file to old version', headers: { Location: request.url } }
+    return {
+      status: 405,
+      body: 'Cannot PUT file to old version',
+      headers: { Location: request.url }
+    }
   }
 
   async function deleteFiles (request) {
@@ -433,7 +448,14 @@ export default async function makeHyperFetch ({
     }
     await drive.del(pathname)
 
-    return { status: 200 }
+    const fullURL = new URL(pathname, drive.url).href
+
+    const headers = {
+      ETag: `${drive.version}`,
+      Link: `<${fullURL}>; rel="canonical"`
+    }
+
+    return { status: 200, headers }
   }
 
   function deleteFilesVersioned (request) {
@@ -741,7 +763,7 @@ function makeToTry (pathname) {
 
 async function resolvePath (drive, pathname, noResolve) {
   if (noResolve) {
-    const entry = drive.entry(pathname)
+    const entry = await drive.entry(pathname)
 
     return { entry, path: pathname }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-fetch",
-  "version": "9.5.0",
+  "version": "9.6.0",
   "description": "Implementation of Fetch that uses the Dat SDK for loading p2p content",
   "type": "module",
   "main": "index.js",

package/test.js

@@ -333,6 +333,22 @@ test('Ignore index.html with noResolve', async (t) => {
   const entries = await listDirRequest.json()
   t.deepEqual(entries, ['index.html'], 'able to list index.html')
 })
+test('Ensure that noResolve works with file paths', async (t) => {
+  const created = await nextURL(t)
+  const uploadLocation = new URL('./example.txt', created)
+  const uploadResponse = await fetch(uploadLocation, {
+    method: 'put',
+    body: SAMPLE_CONTENT
+  })
+  await checkResponse(uploadResponse, t)
+
+  const noResolve = uploadLocation.href + '?noResolve'
+  const getRequest = await fetch(noResolve)
+  await checkResponse(getRequest, t)
+
+  const headRequest = await fetch(noResolve, { method: 'HEAD' })
+  await checkResponse(headRequest, t)
+})
 test('Render index.gmi', async (t) => {
   const created = await nextURL(t)
   const uploadLocation = new URL('./index.gmi', created)