Expose getRequestUrl.

Author: RubenVerborgh

lib/handlers/get.js

@@ -136,15 +136,14 @@ async function globHandler (req, res, next) {
   // TODO: This is a hack, that does not check if the target file exists, as this is quite complex with globbing.
   // TODO: Proper support for this is not implemented, as globbing support might be removed in the future.
   const filename = ldp.resourceMapper.getFilePath(req)
-  const requestUri = (await ldp.resourceMapper.mapFileToUrl({ path: filename, hostname: req.hostname })).url
 
   const globOptions = {
     noext: true,
     nobrace: true,
     nodir: true
   }
 
-  glob(filename, globOptions, function (err, matches) {
+  glob(filename, globOptions, async (err, matches) => {
     if (err || matches.length === 0) {
       debugGlob('No files matching the pattern')
       return next(error(404, 'No files matching glob pattern'))
@@ -154,7 +153,7 @@ async function globHandler (req, res, next) {
     const globGraph = $rdf.graph()
 
     debugGlob('found matches ' + matches)
-    Promise.all(matches.map(match => new Promise(async (resolve, reject) => {
+    await Promise.all(matches.map(match => new Promise(async (resolve, reject) => {
       const urlData = await ldp.resourceMapper.mapFileToUrl({ path: match, hostname: req.hostname })
       fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
         if (err) {
@@ -178,15 +177,15 @@ async function globHandler (req, res, next) {
         })
       })
     })))
-    .then(() => {
-      const data = $rdf.serialize(undefined, globGraph, requestUri, 'text/turtle')
-      // TODO this should be added as a middleware in the routes
-      res.setHeader('Content-Type', 'text/turtle')
-      debugGlob('returning turtle')
-
-      res.send(data)
-      return next()
-    })
+
+    const requestUri = ldp.resourceMapper.getRequestUrl(req)
+    const data = $rdf.serialize(undefined, globGraph, requestUri, 'text/turtle')
+    // TODO this should be added as a middleware in the routes
+    res.setHeader('Content-Type', 'text/turtle')
+    debugGlob('returning turtle')
+
+    res.send(data)
+    next()
   })
 }
 

lib/handlers/put.js

@@ -33,11 +33,10 @@ async function putStream (req, res, next, stream = req) {
   }
 }
 
-async function putAcl (req, res, next) {
+function putAcl (req, res, next) {
   const ldp = req.app.locals.ldp
   const contentType = req.get('content-type')
-  const filename = ldp.resourceMapper.getFilePath(req) // @@ Note: weird to go through filename @@
-  const requestUri = (await ldp.resourceMapper.mapFileToUrl({ path: filename, hostname: req.hostname })).url
+  const requestUri = ldp.resourceMapper.getRequestUrl(req)
 
   if (ldp.isValidRdf(req.body, requestUri, contentType)) {
     const stream = stringToStream(req.body)

lib/resource-mapper.js

@@ -133,8 +133,13 @@ class ResourceMapper {
     return !this._includeHost ? this._rootPath : `${this._rootPath}/${hostname}`
   }
 
-  // Resolve a URL for the given hostname
-  // Optionally, a pathname may be passed that will be appended to the baseUrl.
+  // Returns the URL for the given HTTP request
+  getRequestUrl (req) {
+    const { hostname, pathname } = this._parseUrl(req)
+    return this.resolveUrl(hostname, pathname)
+  }
+
+  // Returns the URL for the relative path on the pod
   resolveUrl (hostname, pathname = '') {
     return !this._includeHost ? `${this._rootUrl}${pathname}`
       : `${this._protocol}//${hostname}${this._port}${this._rootUrl}${pathname}`