hypercore-fetch 9.7.0 → 9.9.0

package/README.md

@@ -120,13 +120,18 @@ Note that this is only available with the `writable: true` flag.
 
 ### `fetch('hyper://NAME/example.txt', {method: 'PUT', body: 'Hello World'})`
 
-You can add files to archives using a `PUT` method along with a `body`.
+You can add files to archives using a `PUT` method along with a
+`body`. Note that this is only available with the `writable: true`
+flag.
 
 The `body` can be any of the options supported by the Fetch API such as a `String`, `Blob`, `FormData`, or `ReadableStream`.
 
 `NAME` can either be the 52 character [z32 encoded](https://github.com/mafintosh/z32) key for a Hyperdrive or Hypercore , or a domain to parse with the [DNSLink](https://www.dnslink.io/) standard.
 
-Note that this is only available with the `writable: true` flag.
+The mtime metadata is automatically set to the current time when
+uploading. To override this value, pass a `Last-Modified` header with a value
+set to a date string according to [RFC
+7231](https://datatracker.ietf.org/doc/html/rfc7231#section-7.1.1.1).
 
 An attempt to `PUT` a file to a hyperdrive which is not writable will
 fail with status `403`.

package/index.js

@@ -3,7 +3,7 @@ import { posix } from 'path'
 import { Readable, pipelinePromise } from 'streamx'
 import Hyperdrive from 'hyperdrive'
 import { makeRoutedFetch } from 'make-fetch'
-import mime from 'mime/lite.js'
+import mime from 'mime/index.js'
 import parseRange from 'range-parser'
 import { EventIterator } from 'event-iterator'
 
@@ -169,6 +169,7 @@ export default async function makeHyperFetch ({
     })
 
     drives.set(drive.core.id, drive)
+    drives.set(drive.core.url, drive)
     drives.set(hostname, drive)
 
     return drive
@@ -397,6 +398,7 @@ export default async function makeHyperFetch ({
     const { hostname, pathname: rawPathname } = new URL(request.url)
     const pathname = decodeURI(ensureLeadingSlash(rawPathname))
     const contentType = request.headers.get('Content-Type') || ''
+    const mtime = Date.parse(request.headers.get('Last-Modified')) || Date.now()
     const isFormData = contentType.includes('multipart/form-data')
 
     const drive = await getDrive(`hyper://${hostname}/`, true)
@@ -405,8 +407,6 @@ 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()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-fetch",
-  "version": "9.7.0",
+  "version": "9.9.0",
   "description": "Implementation of Fetch that uses the Dat SDK for loading p2p content",
   "type": "module",
   "main": "index.js",
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/RangerMauve/hypercore-fetch#readme",
   "dependencies": {
     "event-iterator": "^2.0.0",
-    "hyperdrive": "^11.0.0-alpha.10",
+    "hyperdrive": "^11.6.2",
     "make-fetch": "^3.1.1",
     "mime": "^3.0.0",
     "range-parser": "^1.2.1",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@rangermauve/fetch-event-source": "^1.0.3",
-    "hyper-sdk": "^4.3.0",
+    "hyper-sdk": "^4.4.0",
     "standard": "^17.0.0",
     "tape": "^5.2.2"
   }

package/test.js

@@ -7,6 +7,7 @@ import { once } from 'events'
 import makeHyperFetch from './index.js'
 
 const SAMPLE_CONTENT = 'Hello World'
+const DNS_DOMAIN = 'blog.mauve.moe'
 let count = 0
 function next () {
   return count++
@@ -142,9 +143,13 @@ test('PUT file', async (t) => {
 
   const uploadLocation = new URL('./example.txt', created)
 
+  const fakeDate = new Date(Date.parse(0)).toUTCString()
   const uploadResponse = await fetch(uploadLocation, {
     method: 'put',
-    body: SAMPLE_CONTENT
+    body: SAMPLE_CONTENT,
+    headers: {
+      'Last-Modified': fakeDate
+    }
   })
 
   await checkResponse(uploadResponse, t, 'upload successful')
@@ -159,7 +164,7 @@ test('PUT file', async (t) => {
 
   t.equal(contentType, 'text/plain; charset=utf-8', 'Content got expected mime type')
   t.equal(content, SAMPLE_CONTENT, 'Got uploaded content back out')
-  t.ok(lastModified, 'Last-Modified header got set')
+  t.equal(lastModified, fakeDate, 'Last-Modified header was set to value of Date header')
 })
 test('PUT FormData', async (t) => {
   const created = await nextURL(t)
@@ -287,7 +292,7 @@ test('DELETE a directory', async (t) => {
   })
   await checkResponse(uploadResponse, t)
 
-  const deleteResponse = await fetch(created, {
+  const deleteResponse = await fetch(uploadLocation, {
     method: 'delete'
   })
   await checkResponse(deleteResponse, t, 'Able to DELETE')
@@ -297,7 +302,7 @@ test('DELETE a directory', async (t) => {
   const entries = await listDirRequest.json()
   t.deepEqual(entries, [], 'subfolder got deleted')
 })
-test.only('DELETE a drive from storage', async (t) => {
+test('DELETE a drive from storage', async (t) => {
   const created = await nextURL(t)
 
   const uploadLocation = new URL('./subfolder/example.txt', created)
@@ -494,11 +499,17 @@ test('EventSource extension messages', async (t) => {
 })
 
 test('Resolve DNS', async (t) => {
-  const loadResponse = await fetch('hyper://blog.mauve.moe/?noResolve')
+  const loadResponse = await fetch(`hyper://${DNS_DOMAIN}/?noResolve`)
 
   const entries = await loadResponse.json()
 
   t.ok(entries.length, 'Loaded contents with some files present')
+
+  const rawLink = loadResponse.headers.get('Link').match(/<(.+)>/)[1]
+  const loadRawURLResponse = await fetch(rawLink + '?noResolve')
+
+  const rawLinkEntries = await loadRawURLResponse.json()
+  t.deepEqual(rawLinkEntries, entries, 'Raw link resolves to same content as DNS domain.')
 })
 
 test('Doing a `GET` on an invalid domain/public key should cause an error', async (t) => {
@@ -585,17 +596,10 @@ test('Handle empty string pathname', async (t) => {
     await fetch(urlNoTrailingSlash, {
       method: 'put',
       body: formData
-    }), t
+    }),
+    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')
-
   // HEAD (versioned)
   const versionedHeadResponse = await fetch(versionedURLNoTrailingSlash, { method: 'HEAD' })
   await checkResponse(versionedHeadResponse, t)
@@ -604,16 +608,20 @@ test('Handle empty string pathname', async (t) => {
   // GET
   const getResponse = await fetch(urlNoTrailingSlash)
   await checkResponse(getResponse, t)
-  t.deepEqual(await getResponse.json(), [], 'Returns empty root directory')
+  t.deepEqual(await getResponse.json(), ['example.txt', 'example2.txt'], 'Returns directory listing')
 
   // 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')
+
+  
+  // DELETE
+  await checkResponse(await fetch(urlNoTrailingSlash, { method: 'DELETE' }), t, 'Able to delete root')
 })
 
 test('Return status 403 Forbidden on attempt to modify read-only hyperdrive', async (t) => {
-  const readOnlyURL = 'hyper://blog.mauve.moe/new-file.txt'
+  const readOnlyURL = `hyper://${DNS_DOMAIN}/new-file.txt`
   const putResponse = await fetch(readOnlyURL, { method: 'PUT', body: SAMPLE_CONTENT })
   if (putResponse.ok) {
     throw new Error('PUT file to read-only drive should have failed')
@@ -632,7 +640,7 @@ test('Return status 403 Forbidden on attempt to modify read-only hyperdrive', as
 test('Check hyperdrive writability', async (t) => {
   const created = await nextURL(t)
 
-  const readOnlyRootDirectory = 'hyper://blog.mauve.moe/?noResolve'
+  const readOnlyRootDirectory = `hyper://${DNS_DOMAIN}/?noResolve`
   const readOnlyHeadResponse = await fetch(readOnlyRootDirectory, { method: 'HEAD' })
   await checkResponse(readOnlyHeadResponse, t, 'Able to load HEAD')
   const readOnlyHeadersAllow = readOnlyHeadResponse.headers.get('Allow')