hypercore-fetch 9.0.6 → 9.0.8

package/index.js

@@ -209,7 +209,8 @@ export default async function makeHyperFetch ({
       }
     })
     router.get(`hyper://*/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/*`, async function listenExtension (request) {
-      const { hostname, pathname } = new URL(request.url)
+      const { hostname, pathname: rawPathname } = new URL(request.url)
+      const pathname = decodeURI(rawPathname)
       const name = pathname.slice(`/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/`.length)
 
       const core = await getCore(`hyper://${hostname}/`)
@@ -229,7 +230,9 @@ export default async function makeHyperFetch ({
       }
     })
     router.post(`hyper://*/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/*`, async function broadcastExtension (request) {
-      const { hostname, pathname } = new URL(request.url)
+      const { hostname, pathname: rawPathname } = new URL(request.url)
+      const pathname = decodeURI(rawPathname)
+
       const name = pathname.slice(`/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/`.length)
 
       const core = await getCore(`hyper://${hostname}/`)
@@ -241,7 +244,9 @@ export default async function makeHyperFetch ({
       return { status: 200 }
     })
     router.post(`hyper://*/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/*/*`, async function extensionToPeer (request) {
-      const { hostname, pathname } = new URL(request.url)
+      const { hostname, pathname: rawPathname } = new URL(request.url)
+      const pathname = decodeURI(rawPathname)
+
       const subFolder = pathname.slice(`/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/`.length)
       const [name, extensionPeer] = subFolder.split('/')
 
@@ -275,7 +280,7 @@ export default async function makeHyperFetch ({
       try {
         const drive = await getDriveFromKey(key, true)
 
-        return { body: drive.core.url }
+        return { body: drive.url }
       } catch (e) {
         if (e.message === ERROR_KEY_NOT_CREATED) {
           return {
@@ -300,11 +305,12 @@ export default async function makeHyperFetch ({
 
       const drive = await getDriveFromKey(key, false)
 
-      return { body: drive.core.url }
+      return { body: drive.url }
     })
 
     router.put('hyper://*/**', async function putFiles (request) {
-      const { hostname, pathname } = new URL(request.url)
+      const { hostname, pathname: rawPathname } = new URL(request.url)
+      const pathname = decodeURI(rawPathname)
       const contentType = request.headers.get('Content-Type') || ''
       const isFormData = contentType.includes('multipart/form-data')
 
@@ -339,7 +345,8 @@ export default async function makeHyperFetch ({
       return { status: 201, headers: { Location: request.url } }
     })
     router.delete('hyper://*/**', async function putFiles (request) {
-      const { hostname, pathname } = new URL(request.url)
+      const { hostname, pathname: rawPathname } = new URL(request.url)
+      const pathname = decodeURI(rawPathname)
 
       const drive = await getDrive(`hyper://${hostname}`)
 
@@ -368,14 +375,16 @@ export default async function makeHyperFetch ({
 
   router.head('hyper://*/**', async function headFiles (request) {
     const url = new URL(request.url)
-    const { hostname, pathname, searchParams } = url
+    const { hostname, pathname: rawPathname, searchParams } = url
+    const pathname = decodeURI(rawPathname)
+
     const accept = request.headers.get('Accept') || ''
     const isRanged = request.headers.get('Range') || ''
     const noResolve = searchParams.has('noResolve')
     const isDirectory = pathname.endsWith('/')
 
     const drive = await getDrive(`hyper://${hostname}`)
-    const fullURL = new URL(pathname, drive.core.url).href
+    const fullURL = new URL(pathname, drive.url).href
 
     const resHeaders = {
       ETag: `${drive.version}`,
@@ -435,14 +444,12 @@ export default async function makeHyperFetch ({
       return { status: 404, body: 'Not Found' }
     }
 
-    resHeaders.Link = new URL(path, drive.core.url).href
-
     resHeaders.ETag = `${entry.seq}`
+    resHeaders['Content-Length'] = `${entry.value.blob.byteLength}`
 
     const contentType = getMimeType(path)
     resHeaders[HEADER_CONTENT_TYPE] = contentType
 
-
     if (entry?.value?.metadata?.mtime) {
       const date = new Date(entry.value.metadata.mtime)
       resHeaders[HEADER_LAST_MODIFIED] = date.toUTCString()
@@ -476,13 +483,15 @@ export default async function makeHyperFetch ({
   // TODO: Redirect on directories without trailing slash
   router.get('hyper://*/**', async function getFiles (request) {
     const url = new URL(request.url)
-    const { hostname, pathname, searchParams } = url
+    const { hostname, pathname: rawPathname, searchParams } = url
+    const pathname = decodeURI(rawPathname)
+
     const accept = request.headers.get('Accept') || ''
     const noResolve = searchParams.has('noResolve')
     const isDirectory = pathname.endsWith('/')
 
     const drive = await getDrive(`hyper://${hostname}`)
-    const fullURL = new URL(pathname, drive.core.url).href
+    const fullURL = new URL(pathname, drive.url).href
 
     if (isDirectory) {
       const resHeaders = {
@@ -547,11 +556,10 @@ 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 fullURL = new URL(pathname, drive.url).href
 
   const entry = await drive.entry(pathname)
 
-
   const resHeaders = {
     ETag: `${entry.seq}`,
     [HEADER_CONTENT_TYPE]: contentType,
@@ -559,7 +567,6 @@ async function serveFile (headers, drive, pathname) {
     Link: `<${fullURL}>; rel="canonical"`
   }
 
-
   if (entry?.value?.metadata?.mtime) {
     const date = new Date(entry.value.metadata.mtime)
     resHeaders[HEADER_LAST_MODIFIED] = date.toUTCString()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-fetch",
-  "version": "9.0.6",
+  "version": "9.0.8",
   "description": "Implementation of Fetch that uses the Dat SDK for loading p2p content",
   "type": "module",
   "main": "index.js",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@rangermauve/fetch-event-source": "^1.0.3",
-    "hyper-sdk": "^4.1.1",
+    "hyper-sdk": "^4.2.3",
     "standard": "^17.0.0",
     "tape": "^5.2.2"
   }

package/test.js

@@ -57,7 +57,7 @@ test('Quick check', async (t) => {
 
   t.deepEqual(await existsResponse.json(), [], 'Empty dir on create')
 
-  const uploadLocation = new URL('./example.txt', created)
+  const uploadLocation = new URL('./example .txt', created)
 
   const uploadResponse = await fetch(uploadLocation, {
     method: 'put',
@@ -74,7 +74,7 @@ test('Quick check', async (t) => {
   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.match(contentLink, /^<hyper:\/\/[0-9a-z]{52}\/example%20.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')
 
@@ -82,7 +82,7 @@ test('Quick check', async (t) => {
 
   await checkResponse(dirResponse, t)
 
-  t.deepEqual(await dirResponse.json(), ['example.txt'], 'File got added')
+  t.deepEqual(await dirResponse.json(), ['example .txt'], 'File got added')
 })
 
 test('GET full url for created keys', async (t) => {
@@ -111,6 +111,31 @@ test('GET full url for created keys', async (t) => {
   t.equal(existingURL, createdURL, 'URL same as in initial create')
 })
 
+test('HEAD request', async (t) => {
+  const created = await nextURL(t)
+  const uploadLocation = new URL('./example.txt', created)
+  await fetch(uploadLocation, { method: 'put', body: SAMPLE_CONTENT })
+
+  const headResponse = await fetch(uploadLocation, { method: 'head' })
+
+  await checkResponse(headResponse, t, 'Able to load HEAD')
+
+  const headersEtag = headResponse.headers.get('Etag')
+  const headersContentType = headResponse.headers.get('Content-Type')
+  const headersContentLength = headResponse.headers.get('Content-Length')
+  const headersAcceptRanges = headResponse.headers.get('Accept-Ranges')
+  const headersLastModified = headResponse.headers.get('Last-Modified')
+  const headersLink = headResponse.headers.get('Link')
+
+  // Version at which the file was added
+  t.equal(headersEtag, '1', 'Headers got expected etag')
+  t.equal(headersContentType, 'text/plain; charset=utf-8', 'Headers got expected mime type')
+  t.ok(headersContentLength, "Headers have 'Content-Length' set.")
+  t.ok(headersLastModified, "Headers have 'Last-Modified' set.")
+  t.equal(headersAcceptRanges, 'bytes')
+  t.match(headersLink, /^<hyper:\/\/[0-9a-z]{52}\/example.txt>; rel="canonical"$/, 'Link header includes both public key and path.')
+})
+
 test('PUT file', async (t) => {
   const created = await nextURL(t)
 
@@ -421,6 +446,26 @@ test('EventSource extension messages', async (t) => {
   t.ok(lastEventId, 'Event contained peer ID')
 })
 
+test('Resolve DNS', async (t) => {
+  const loadResponse = await fetch('hyper://example2.mauve.moe/')
+
+  const entries = await loadResponse.json()
+
+  t.pass('Loaded contents and ')
+})
+
+test('Error on invalid hostname', async (t) => {
+  const loadResponse = await fetch('hyper://example/')
+
+  console.log(loadResponse.status)
+
+  if(loadResponse.ok) {
+    throw new Error('Loading without DNS or a public key should have failed')
+  } else {
+    t.pass("Invalid names led to an error")
+  }
+})
+
 async function checkResponse (response, t, successMessage = 'Response OK') {
   if (!response.ok) {
     const message = await response.text()