hypercore-fetch 9.3.0 → 9.4.0

package/README.md

@@ -200,3 +200,8 @@ You can get older views of data in an archive by using the special `/$/version`
 From there, you can use `GET` and `HEAD` requests with allt he same headers and querystring paramters as non-versioned paths to data.
 
 Note that you cannot `PUT` or `DELETE` data in a versioned folder.
+
+
+## Limitations:
+
+- Since we make use of the special directory `$`, you cannot store files in this folder. If this is a major blocker, feel free to open an issue with alternative folder names we should consider.

package/index.js

@@ -25,6 +25,16 @@ const MIME_EVENT_STREAM = 'text/event-stream; charset=utf-8'
 const HEADER_CONTENT_TYPE = 'Content-Type'
 const HEADER_LAST_MODIFIED = 'Last-Modified'
 
+const WRITABLE_METHODS = [
+  'PUT',
+  'DELETE'
+]
+
+const BASIC_METHODS = [
+  'HEAD',
+  'GET'
+]
+
 export const ERROR_KEY_NOT_CREATED = 'Must create key with POST before reading'
 
 const INDEX_FILES = [
@@ -244,7 +254,7 @@ export default async function makeHyperFetch ({
 
   async function listenExtension (request) {
     const { hostname, pathname: rawPathname } = new URL(request.url)
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
     const name = pathname.slice(`/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/`.length)
 
     const core = await getCore(`hyper://${hostname}/`)
@@ -266,7 +276,7 @@ export default async function makeHyperFetch ({
 
   async function broadcastExtension (request) {
     const { hostname, pathname: rawPathname } = new URL(request.url)
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const name = pathname.slice(`/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/`.length)
 
@@ -281,7 +291,7 @@ export default async function makeHyperFetch ({
 
   async function extensionToPeer (request) {
     const { hostname, pathname: rawPathname } = new URL(request.url)
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const subFolder = pathname.slice(`/${SPECIAL_FOLDER}/${EXTENSIONS_FOLDER_NAME}/`.length)
     const [name, extensionPeer] = subFolder.split('/')
@@ -345,7 +355,7 @@ export default async function makeHyperFetch ({
 
   async function putFiles (request) {
     const { hostname, pathname: rawPathname } = new URL(request.url)
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
     const contentType = request.headers.get('Content-Type') || ''
     const isFormData = contentType.includes('multipart/form-data')
 
@@ -367,14 +377,18 @@ export default async function makeHyperFetch ({
         )
       }
     } else {
-      await pipelinePromise(
-        Readable.from(request.body),
-        drive.createWriteStream(pathname, {
-          metadata: {
-            mtime: Date.now()
-          }
-        })
-      )
+      if (pathname.endsWith('/')) {
+        return { status: 405, body: 'Cannot PUT file with trailing slash', headers: { Location: request.url } }
+      } else {
+        await pipelinePromise(
+          Readable.from(request.body),
+          drive.createWriteStream(pathname, {
+            metadata: {
+              mtime: Date.now()
+            }
+          })
+        )
+      }
     }
 
     return { status: 201, headers: { Location: request.url } }
@@ -382,7 +396,7 @@ export default async function makeHyperFetch ({
 
   async function deleteFiles (request) {
     const { hostname, pathname: rawPathname } = new URL(request.url)
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const drive = await getDrive(`hyper://${hostname}`)
 
@@ -411,7 +425,7 @@ export default async function makeHyperFetch ({
   async function headFilesVersioned (request) {
     const url = new URL(request.url)
     const { hostname, pathname: rawPathname, searchParams } = url
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const accept = request.headers.get('Accept') || ''
     const isRanged = request.headers.get('Range') || ''
@@ -419,7 +433,7 @@ export default async function makeHyperFetch ({
 
     const parts = pathname.split('/')
     const version = parts[3]
-    const realPath = parts.slice(4).join('/')
+    const realPath = ensureLeadingSlash(parts.slice(4).join('/'))
 
     const drive = await getDrive(`hyper://${hostname}`)
 
@@ -431,7 +445,7 @@ export default async function makeHyperFetch ({
   async function headFiles (request) {
     const url = new URL(request.url)
     const { hostname, pathname: rawPathname, searchParams } = url
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const accept = request.headers.get('Accept') || ''
     const isRanged = request.headers.get('Range') || ''
@@ -446,10 +460,15 @@ export default async function makeHyperFetch ({
     const isDirectory = pathname.endsWith('/')
     const fullURL = new URL(pathname, drive.url).href
 
+    const isWritable = writable && drive.writable
+
+    const Allow = isWritable ? BASIC_METHODS.concat(WRITABLE_METHODS) : BASIC_METHODS
+
     const resHeaders = {
       ETag: `${drive.version}`,
       'Accept-Ranges': 'bytes',
-      Link: `<${fullURL}>; rel="canonical"`
+      Link: `<${fullURL}>; rel="canonical"`,
+      Allow
     }
 
     if (isDirectory) {
@@ -507,7 +526,7 @@ export default async function makeHyperFetch ({
       return { status: 404, body: 'Not Found' }
     }
 
-    resHeaders.ETag = `${entry.seq}`
+    resHeaders.ETag = `${entry.seq + 1}`
     resHeaders['Content-Length'] = `${entry.value.blob.byteLength}`
 
     const contentType = getMimeType(path)
@@ -546,7 +565,7 @@ export default async function makeHyperFetch ({
   async function getFilesVersioned (request) {
     const url = new URL(request.url)
     const { hostname, pathname: rawPathname, searchParams } = url
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const accept = request.headers.get('Accept') || ''
     const isRanged = request.headers.get('Range') || ''
@@ -554,7 +573,7 @@ export default async function makeHyperFetch ({
 
     const parts = pathname.split('/')
     const version = parts[3]
-    const realPath = parts.slice(4).join('/')
+    const realPath = ensureLeadingSlash(parts.slice(4).join('/'))
 
     const drive = await getDrive(`hyper://${hostname}`)
 
@@ -567,7 +586,7 @@ export default async function makeHyperFetch ({
   async function getFiles (request) {
     const url = new URL(request.url)
     const { hostname, pathname: rawPathname, searchParams } = url
-    const pathname = decodeURI(rawPathname)
+    const pathname = decodeURI(ensureLeadingSlash(rawPathname))
 
     const accept = request.headers.get('Accept') || ''
     const isRanged = request.headers.get('Range') || ''
@@ -604,7 +623,7 @@ export default async function makeHyperFetch ({
       if (!noResolve) {
         for (const indexFile of INDEX_FILES) {
           if (entries.includes(indexFile)) {
-            return serveFile(drive, posix.join(pathname, 'indexFile'), isRanged)
+            return serveFile(drive, posix.join(pathname, indexFile), isRanged)
           }
         }
       }
@@ -651,7 +670,7 @@ async function serveFile (drive, pathname, isRanged) {
   const entry = await drive.entry(pathname)
 
   const resHeaders = {
-    ETag: `${entry.seq}`,
+    ETag: `${entry.seq + 1}`,
     [HEADER_CONTENT_TYPE]: contentType,
     'Accept-Ranges': 'bytes',
     Link: `<${fullURL}>; rel="canonical"`
@@ -749,3 +768,7 @@ function getMimeType (path) {
   if (mimeType.startsWith('text/')) mimeType = `${mimeType}; charset=utf-8`
   return mimeType
 }
+
+function ensureLeadingSlash (path) {
+  return path.startsWith('/') ? path : '/' + path
+}

package/package.json

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

package/test.js

@@ -128,7 +128,7 @@ test('HEAD request', async (t) => {
   const headersLink = headResponse.headers.get('Link')
 
   // Version at which the file was added
-  t.equal(headersEtag, '1', 'Headers got expected etag')
+  t.equal(headersEtag, '2', '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.")
@@ -333,6 +333,26 @@ test('Ignore index.html with noResolve', async (t) => {
   const entries = await listDirRequest.json()
   t.deepEqual(entries, ['index.html'], 'able to list index.html')
 })
+test('Render index.gmi', async (t) => {
+  const created = await nextURL(t)
+  const uploadLocation = new URL('./index.gmi', created)
+
+  const uploadResponse = await fetch(uploadLocation, {
+    method: 'put',
+    body: SAMPLE_CONTENT
+  })
+  await checkResponse(uploadResponse, t)
+
+  const uploadedContentResponse = await fetch(created)
+
+  await checkResponse(uploadedContentResponse, t)
+
+  const content = await uploadedContentResponse.text()
+  const contentType = uploadedContentResponse.headers.get('Content-Type')
+
+  t.equal(contentType, 'text/gemini; charset=utf-8', 'got HTML mime type')
+  t.equal(content, SAMPLE_CONTENT, 'loaded index.html content')
+})
 test('Read directory as HTML', async (t) => {
   const created = await nextURL(t)
 
@@ -447,7 +467,7 @@ test('EventSource extension messages', async (t) => {
 })
 
 test('Resolve DNS', async (t) => {
-  const loadResponse = await fetch('hyper://example2.mauve.moe/?noResolve')
+  const loadResponse = await fetch('hyper://blog.mauve.moe/?noResolve')
 
   const entries = await loadResponse.json()
 
@@ -474,6 +494,7 @@ test('GET older version of file from VERSION folder', async (t) => {
 
   const fileURL = new URL(`/${fileName}`, created)
   const versionFileURL = new URL(`/$/version/2/${fileName}`, created)
+  const versionRootURL = new URL('/$/version/1/', created)
 
   await checkResponse(
     await fetch(fileURL, { method: 'PUT', body: data1 }), t
@@ -482,13 +503,66 @@ test('GET older version of file from VERSION folder', async (t) => {
     await fetch(fileURL, { method: 'PUT', body: data2 }), t
   )
 
-  const versionedResponse = await fetch(versionFileURL)
+  const versionedFileResponse = await fetch(versionFileURL)
+  await checkResponse(versionedFileResponse, t, 'Able to GET versioned file')
+  const versionedFileData = await versionedFileResponse.text()
+  t.equal(versionedFileData, data1, 'Old data got loaded')
+
+  const versionedRootResponse = await fetch(versionRootURL)
+  await checkResponse(versionedRootResponse, t, 'Able to GET versioned root')
+  const versionedRootContents = await versionedRootResponse.json()
+  t.deepEqual(versionedRootContents, [], 'Old root content got loaded')
+})
+
+test('Handle empty string pathname', async (t) => {
+  const created = await nextURL(t)
+  const urlObject = new URL('', created)
+  const urlNoTrailingSlash = urlObject.href.slice(0, -1)
+  const versionedURLObject = new URL('/$/version/3/', created)
+  const versionedURLNoTrailingSlash = versionedURLObject.href.slice(0, -1)
+
+  // PUT
+  const putResponse = await fetch(urlNoTrailingSlash, { method: 'PUT', body: SAMPLE_CONTENT })
+  if (putResponse.ok) {
+    throw new Error('PUT file at the root directory should have failed')
+  } else {
+    t.pass('PUT file at root directory threw an error')
+  }
+
+  // PUT FormData
+  const formData = new FormData()
+  formData.append('file', new Blob([SAMPLE_CONTENT]), 'example.txt')
+  formData.append('file', new Blob([SAMPLE_CONTENT]), 'example2.txt')
+
+  await checkResponse(
+    await fetch(urlNoTrailingSlash, {
+      method: 'put',
+      body: formData
+    }), t
+  )
+
+  // DELETE
+  await checkResponse(await fetch(urlNoTrailingSlash, { method: 'DELETE' }), t)
+
+  // HEAD
+  const headResponse = await fetch(urlNoTrailingSlash, { method: 'HEAD' })
+  await checkResponse(headResponse, t)
+  t.deepEqual(headResponse.headers.get('Etag'), '5', 'HEAD request returns correct Etag')
 
-  await checkResponse(versionedResponse, t, 'Able to GET versioned file')
+  // HEAD (versioned)
+  const versionedHeadResponse = await fetch(versionedURLNoTrailingSlash, { method: 'HEAD' })
+  await checkResponse(versionedHeadResponse, t)
+  t.deepEqual(versionedHeadResponse.headers.get('Etag'), '3', 'Versioned HEAD request returns correct Etag')
 
-  const versionedData = await versionedResponse.text()
+  // GET
+  const getResponse = await fetch(urlNoTrailingSlash)
+  await checkResponse(getResponse, t)
+  t.deepEqual(await getResponse.json(), [], 'Returns empty root directory')
 
-  t.equal(versionedData, data1, 'Old data got loaded')
+  // GET (versioned)
+  const versionedGetResponse = await fetch(versionedURLNoTrailingSlash)
+  await checkResponse(versionedGetResponse, t)
+  t.deepEqual(await versionedGetResponse.json(), ['example.txt', 'example2.txt'], 'Returns root directory prior to DELETE')
 })
 
 async function checkResponse (response, t, successMessage = 'Response OK') {