hypercore-fetch 9.0.1 → 9.0.3

package/index.js

@@ -271,7 +271,7 @@ export default async function makeHyperFetch ({
 
       const drive = await getDriveFromKey(key, true)
 
-      return { body: drive.url }
+      return { body: drive.core.url }
     })
     router.post(`hyper://${SPECIAL_DOMAIN}/`, async function createKey (request) {
       // TODO: Allow importing secret keys here
@@ -356,11 +356,12 @@ export default async function makeHyperFetch ({
     const isDirectory = pathname.endsWith('/')
 
     const drive = await getDrive(`hyper://${hostname}`)
+    const fullURL = new URL(pathname, drive.core.url).href
 
     const resHeaders = {
       ETag: `${drive.version}`,
       'Accept-Ranges': 'bytes',
-      Link: `<${drive.core.url}>; rel="canonical"`
+      Link: `<${fullURL}>; rel="canonical"`
     }
 
     if (isDirectory) {
@@ -415,6 +416,8 @@ export default async function makeHyperFetch ({
       return { status: 404, body: 'Not Found' }
     }
 
+    resHeaders.Link = new URL(path, drive.core.url).href
+
     resHeaders.ETag = `${entry.seq}`
 
     const contentType = getMimeType(path)
@@ -459,11 +462,12 @@ export default async function makeHyperFetch ({
     const isDirectory = pathname.endsWith('/')
 
     const drive = await getDrive(`hyper://${hostname}`)
+    const fullURL = new URL(pathname, drive.core.url).href
 
     if (isDirectory) {
       const resHeaders = {
         ETag: `${drive.version}`,
-        Link: `<${drive.core.url}>; rel="canonical"`
+        Link: `<${fullURL}>; rel="canonical"`
       }
 
       const entries = await listEntries(drive, pathname)
@@ -523,13 +527,15 @@ async function serveFile (headers, drive, pathname) {
   const isRanged = headers.get('Range') || ''
   const contentType = getMimeType(pathname)
 
+  const fullURL = new URL(pathname, drive.core.url).href
+
   const entry = await drive.entry(pathname)
 
   const resHeaders = {
     ETag: `${entry.seq}`,
     [HEADER_CONTENT_TYPE]: contentType,
     'Accept-Ranges': 'bytes',
-    Link: `<${drive.core.url}>; rel="canonical"`
+    Link: `<${fullURL}>; rel="canonical"`
   }
 
   if (entry.metadata?.mtime) {

package/package.json

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

package/test.js

@@ -72,7 +72,9 @@ test('Quick check', async (t) => {
 
   const content = await uploadedContentResponse.text()
   const contentType = uploadedContentResponse.headers.get('Content-Type')
+  const contentLink = uploadedContentResponse.headers.get('Link')
 
+  t.match(contentLink, /^<hyper:\/\/[0-9a-z]{52}\/example.txt>; rel="canonical"$/, 'Link header includes both public key and path.')
   t.equal(contentType, 'text/plain; charset=utf-8', 'Content got expected mime type')
   t.equal(content, SAMPLE_CONTENT, 'Got uploaded content back out')