Merge branch 'resourceMapper' of https://github.com/solid/node-solid-…

…server into main

lib/ldp.js

@@ -459,7 +459,7 @@ class LDP {
       ({ path, contentType } = await this.resourceMapper.mapUrlToFile({ url: options, searchIndex }))
       stats = await this.stat(path)
     } catch (err) {
-      throw error(404, 'Can\'t find file requested: ' + options)
+      throw error(err.status || 500, err.message)
     }
 
     // Just return, since resource exists

lib/resource-mapper.js

@@ -125,7 +125,7 @@ class ResourceMapper {
 
       // Find a file with the same name (minus the dollar extension)
       let match = ''
-      if (match === '') { // always true to keep indentation
+      try {
         const files = await this._readdir(folder)
         // Search for files with the same name (disregarding a dollar extension)
         if (!isFolder) {
@@ -134,13 +134,15 @@ class ResourceMapper {
         } else if (searchIndex && files.includes(this._indexFilename)) {
           match = this._indexFilename
         }
+      } catch (err) {
+        throw new HTTPError(404, `${filePath} Resource not found`)
       }
       // Error if no match was found (unless URL ends with '/', then fall back to the folder)
       if (match === undefined) {
         if (isIndex) {
           match = ''
         } else {
-          throw new HTTPError(404, `Resource not found: ${pathname}`)
+          throw new HTTPError(404, `${pathname} Resource not found`)
         }
       }
       path = `${folder}${match}`