hypercore-fetch 9.0.4 → 9.0.6

package/index.js

@@ -22,6 +22,7 @@ const MIME_TEXT_HTML = 'text/html; charset=utf-8'
 const MIME_EVENT_STREAM = 'text/event-stream; charset=utf-8'
 
 const HEADER_CONTENT_TYPE = 'Content-Type'
+const HEADER_LAST_MODIFIED = 'Last-Modified'
 
 export const ERROR_KEY_NOT_CREATED = 'Must create key with POST before reading'
 
@@ -327,7 +328,11 @@ export default async function makeHyperFetch ({
       } else {
         await pipelinePromise(
           Readable.from(request.body),
-          drive.createWriteStream(pathname)
+          drive.createWriteStream(pathname, {
+            metadata: {
+              mtime: Date.now()
+            }
+          })
         )
       }
 
@@ -435,11 +440,12 @@ export default async function makeHyperFetch ({
     resHeaders.ETag = `${entry.seq}`
 
     const contentType = getMimeType(path)
-    resHeaders['Content-Type'] = contentType
+    resHeaders[HEADER_CONTENT_TYPE] = contentType
+
 
-    if (entry.metadata?.mtime) {
-      const date = new Date(entry.metadata.mtime)
-      resHeaders['Last-Modified'] = date.toUTCString()
+    if (entry?.value?.metadata?.mtime) {
+      const date = new Date(entry.value.metadata.mtime)
+      resHeaders[HEADER_LAST_MODIFIED] = date.toUTCString()
     }
 
     const size = entry.value.byteLength
@@ -545,6 +551,7 @@ async function serveFile (headers, drive, pathname) {
 
   const entry = await drive.entry(pathname)
 
+
   const resHeaders = {
     ETag: `${entry.seq}`,
     [HEADER_CONTENT_TYPE]: contentType,
@@ -552,9 +559,10 @@ async function serveFile (headers, drive, pathname) {
     Link: `<${fullURL}>; rel="canonical"`
   }
 
-  if (entry.metadata?.mtime) {
-    const date = new Date(entry.metadata.mtime)
-    resHeaders['Last-Modified'] = date.toUTCString()
+
+  if (entry?.value?.metadata?.mtime) {
+    const date = new Date(entry.value.metadata.mtime)
+    resHeaders[HEADER_LAST_MODIFIED] = date.toUTCString()
   }
 
   const size = entry.value.blob.byteLength
@@ -617,7 +625,8 @@ async function resolvePath (drive, pathname, noResolve) {
 async function listEntries (drive, pathname = '/') {
   const entries = []
   for await (const path of drive.readdir(pathname)) {
-    const stat = await drive.entry(path)
+    const fullPath = posix.join(pathname, path)
+    const stat = await drive.entry(fullPath)
     if (stat === null) {
       entries.push(path + '/')
     } else {

package/package.json

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

package/test.js

@@ -104,7 +104,7 @@ test('GET full url for created keys', async (t) => {
   t.ok(createdURL.startsWith('hyper://'), 'Got new hyper:// URL')
 
   const nowExistingResponse = await fetch(keyURL)
-  await checkResponse(nowExistingResponse, t,'GET no longer fails on create')
+  await checkResponse(nowExistingResponse, t, 'GET no longer fails on create')
 
   const existingURL = await nowExistingResponse.text()
 
@@ -129,9 +129,11 @@ test('PUT file', async (t) => {
 
   const content = await uploadedContentResponse.text()
   const contentType = uploadedContentResponse.headers.get('Content-Type')
+  const lastModified = uploadedContentResponse.headers.get('Last-Modified')
 
   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')
 })
 test('PUT FormData', async (t) => {
   const created = await nextURL(t)
@@ -182,10 +184,16 @@ test('PUT into new directory', 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')
 
-  const listDirRequest = await fetch(created)
-  await checkResponse(listDirRequest, t)
-  const entries = await listDirRequest.json()
-  t.deepEqual(entries, ['subfolder/'], 'new files are listed')
+  const topDirResponse = await fetch(created)
+  await checkResponse(topDirResponse, t)
+  const topDirEntries = await topDirResponse.json()
+  t.deepEqual(topDirEntries, ['subfolder/'], 'subdirectory is listed')
+
+  const subDir = new URL('./subfolder/', created)
+  const subDirResponse = await fetch(subDir)
+  await checkResponse(subDirResponse, t)
+  const subDirEntries = await subDirResponse.json()
+  t.deepEqual(subDirEntries, ['example.txt'], 'new file is listed')
 })
 test('PUT to overwrite a file', async (t) => {
   const created = await nextURL(t)