Fix minor LDP issues with new ResourceMapper

Author: rubensworks

lib/handlers/index.js

@@ -9,9 +9,10 @@ async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
   const negotiator = new Negotiator(req)
   const requestedType = negotiator.mediaType()
-  const { path: filename } = await req.app.locals.ldp.resourceMapper.mapUrlToFile({ url: req })
 
   try {
+    const { path: filename } = await req.app.locals.ldp.resourceMapper.mapUrlToFile({ url: req })
+
     const stats = await ldp.stat(filename)
     if (!stats.isDirectory()) {
       return next()

lib/ldp.js

@@ -1,12 +1,10 @@
-const mime = require('mime-types')
 const path = require('path')
 const url = require('url')
 const fs = require('fs')
 const $rdf = require('rdflib')
 const mkdirp = require('fs-extra').mkdirp
 const uuid = require('uuid')
 const debug = require('./debug')
-const utils = require('./utils')
 const error = require('./http-error')
 const stringToStream = require('./utils').stringToStream
 const serialize = require('./utils').serialize
@@ -102,16 +100,12 @@ class LDP {
   }
 
   async readResource (url) {
-    const { path } = await this.resourceMapper.mapUrlToFile({ url })
-    return new Promise((resolve, reject) => {
-      fs.readFile(
-        path,
-        { 'encoding': 'utf8' },
-        (err, data) => {
-          if (err) return reject(error(err, "Can't read file"))
-          resolve(data)
-        })
-    })
+    try {
+      const { path } = await this.resourceMapper.mapUrlToFile({ url })
+      return await promisify(fs.readFile)(path, {'encoding': 'utf8'})
+    } catch (err) {
+      throw error(404, "Can't read file")
+    }
   }
 
   async readContainerMeta (url) {
@@ -330,15 +324,15 @@ class LDP {
   }
 
   async get (options) {
-    const { path: filename, contentType } = await this.resourceMapper.mapUrlToFile({ url: options })
-    const baseUri = this.resourceMapper.resolveUrl(options.hostname)
-
-    let stats
+    let filename, contentType, stats
     try {
+      ({ path: filename, contentType } = await this.resourceMapper.mapUrlToFile({ url: options }))
       stats = await this.stat(filename)
     } catch (err) {
-      throw error(err, 'Can\'t find file requested: ' + filename)
+      throw error(404, 'Can\'t find file requested: ' + options)
     }
+    const baseUri = this.resourceMapper.getBaseUrl(options.hostname)
+
     // Just return, since resource exists
     if (!options.includeBody) {
       return { 'stream': stats, 'contentType': contentType, 'container': stats.isDirectory() }
@@ -386,32 +380,27 @@ class LDP {
           })
           .on('open', function () {
             debug.handlers(`GET -- Reading ${filename}`)
-            let contentType = mime.lookup(filename) || DEFAULT_CONTENT_TYPE
-            if (utils.hasSuffix(filename, this.turtleExtensions)) {
-              contentType = 'text/turtle'
-            }
             return resolve({ stream, contentType, container: false, contentRange, chunksize })
           })
       })
     }
   }
 
   async delete (url) {
-    const { path } = await this.resourceMapper.mapUrlToFile({ url })
-
     // First check if the path points to a valid file
-    let stats
+    let filePath, stats
     try {
-      stats = await this.stat(path)
+      ({ path: filePath } = await this.resourceMapper.mapUrlToFile({ url }))
+      stats = await this.stat(filePath)
     } catch (err) {
       throw error(404, "Can't find " + err)
     }
 
     // If so, delete the directory or file
     if (stats.isDirectory()) {
-      return this.deleteContainer(path)
+      return this.deleteContainer(filePath)
     } else {
-      return this.deleteResource(path)
+      return this.deleteResource(filePath)
     }
   }