Polish code related to ResourceMapper

Author: rubensworks

lib/capability-discovery.js

@@ -46,7 +46,7 @@ function capabilityDiscovery () {
 function serviceCapabilityDocument (serviceConfig) {
   return (req, res) => {
     // Add the server root url
-    serviceConfig.root = req.app.locals.ldp.resourceMapper.getBaseUrl(req.hostname, req.path)
+    serviceConfig.root = req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, req.path)
     // Add the 'apps' urls section
     serviceConfig.apps = req.app.locals.appUrls
     res.json(serviceConfig)

lib/handlers/allow.js

@@ -11,7 +11,7 @@ function allow (mode) {
     }
 
     // Set up URL to filesystem mapping
-    const rootUrl = ldp.resourceMapper.getBaseUrl(req.hostname)
+    const rootUrl = ldp.resourceMapper.resolveUrl(req.hostname)
 
     // Determine the actual path of the request
     // (This is used as an ugly hack to check the ACL status of other resources.)

lib/handlers/copy.js

@@ -20,7 +20,7 @@ async function handler (req, res, next) {
   }
   const fromExternal = !!url.parse(copyFrom).hostname
   const ldp = req.app.locals.ldp
-  const serverRoot = ldp.resourceMapper.getBaseUrl(req.hostname)
+  const serverRoot = ldp.resourceMapper.resolveUrl(req.hostname)
   const copyFromUrl = fromExternal ? copyFrom : serverRoot + copyFrom
   const copyTo = res.locals.path || req.path
   const { path: copyToPath } = await ldp.resourceMapper.mapUrlToFile({ url: req })

lib/handlers/get.js

@@ -20,7 +20,7 @@ async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
   const includeBody = req.method === 'GET'
   const negotiator = new Negotiator(req)
-  const baseUri = ldp.resourceMapper.getBaseUrl(req.hostname, req.path)
+  const baseUri = ldp.resourceMapper.resolveUrl(req.hostname, req.path)
   const path = res.locals.path || req.path
   const requestedType = negotiator.mediaType()
   let possibleRDFType = negotiator.mediaType(RDFs)
@@ -31,7 +31,7 @@ async function handler (req, res, next) {
 
   // Set live updates
   if (ldp.live) {
-    res.header('Updates-Via', ldp.resourceMapper.getBaseUrl(req.hostname).replace(/^http/, 'ws'))
+    res.header('Updates-Via', ldp.resourceMapper.resolveUrl(req.hostname).replace(/^http/, 'ws'))
   }
 
   debug(req.originalUrl + ' on ' + req.hostname)
@@ -156,21 +156,21 @@ async function globHandler (req, res, next) {
 
     debugGlob('found matches ' + matches)
     Promise.all(matches.map(match => new Promise(async (resolve, reject) => {
-      const baseUri = await ldp.resourceMapper.mapFileToUrl({ path: match, hostname: req.hostname })
+      const urlData = await ldp.resourceMapper.mapFileToUrl({ path: match, hostname: req.hostname })
       fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
         if (err) {
           debugGlob('error ' + err)
           return resolve()
         }
-        // Files should have the .ttl extension or be extensionless (also Turtle)
-        if (baseUri.contentType !== 'text/turtle') {
+        // Files should be Turtle
+        if (urlData.contentType !== 'text/turtle') {
           return resolve()
         }
         // The agent should have Read access to the file
         hasReadPermissions(match, req, res, function (allowed) {
           if (allowed) {
             try {
-              $rdf.parse(fileData, globGraph, baseUri.url, 'text/turtle')
+              $rdf.parse(fileData, globGraph, urlData.url, 'text/turtle')
             } catch (parseErr) {
               debugGlob(`error parsing ${match}: ${parseErr}`)
             }

lib/handlers/index.js

@@ -30,8 +30,8 @@ async function handler (req, res, next) {
     await ldp.exists(req.hostname, path.join(req.path, indexFile))
     res.locals.path = path.join(req.path, indexFile)
     debug('Found an index for current path')
-    return next()
   } catch (e) {
-    next()
+    // Ignore errors
   }
+  next()
 }

lib/handlers/options.js

@@ -22,7 +22,7 @@ function linkAuthProvider (req, res) {
 }
 
 function linkServiceEndpoint (req, res) {
-  let serviceEndpoint = url.resolve(req.app.locals.ldp.resourceMapper.getBaseUrl(req.hostname, req.path), '.well-known/solid')
+  let serviceEndpoint = url.resolve(req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, req.path), '.well-known/solid')
   addLink(res, serviceEndpoint, 'service')
 }
 

lib/header.js

@@ -103,7 +103,7 @@ function addPermissions (req, res, next) {
   if (!acl) return next()
 
   // Turn permissions for the public and the user into a header
-  const resource = req.app.locals.ldp.resourceMapper.getBaseUrl(req.hostname, req.path)
+  const resource = req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, req.path)
   Promise.all([
     getPermissionsFor(acl, null, resource),
     getPermissionsFor(acl, session.userId, resource)

lib/ldp.js

@@ -74,7 +74,7 @@ class LDP {
     debug.settings('Config path: ' + this.configPath)
     debug.settings('Suffix Acl: ' + this.suffixAcl)
     debug.settings('Suffix Meta: ' + this.suffixMeta)
-    debug.settings('Filesystem Root: ' + (this.resourceMapper ? this.resourceMapper._rootPath : 'none'))
+    debug.settings('Filesystem Root: ' + (this.resourceMapper ? this.resourceMapper.rootPath : 'none'))
     debug.settings('Allow WebID authentication: ' + !!this.webid)
     debug.settings('Live-updates: ' + !!this.live)
     debug.settings('Multi-user: ' + !!this.multiuser)
@@ -181,7 +181,7 @@ class LDP {
       }
     }
     const { url: putUrl, contentType } = await this.resourceMapper.mapFileToUrl(
-      { path: this.resourceMapper._rootPath + resourcePath, hostname: host })
+      { path: this.resourceMapper.rootPath + resourcePath, hostname: host })
     await ldp.put(putUrl, stream, contentType)
     return originalPath
   }
@@ -249,7 +249,7 @@ class LDP {
       })
       file.on('finish', function () {
         debug.handlers('PUT -- Wrote data to: ' + filePath)
-        resolve(null)
+        resolve()
       })
     })
   }
@@ -326,7 +326,7 @@ class LDP {
 
   async get (options) {
     const { path: filename, contentType } = await this.resourceMapper.mapUrlToFile({ url: options })
-    const baseUri = this.resourceMapper.getBaseUrl(options.hostname)
+    const baseUri = this.resourceMapper.resolveUrl(options.hostname)
 
     let stats
     try {
@@ -385,7 +385,7 @@ class LDP {
             if (utils.hasSuffix(filename, this.turtleExtensions)) {
               contentType = 'text/turtle'
             }
-            return resolve({ stream, contentType, 'container': false, contentRange, chunksize })
+            return resolve({ stream, contentType, container: false, contentRange, chunksize })
           })
       })
     }

lib/resource-mapper.js

@@ -29,7 +29,7 @@ class ResourceMapper {
     }
   }
 
-  get rootPath() {
+  get rootPath () {
     return this._rootPath
   }
 
@@ -68,7 +68,7 @@ class ResourceMapper {
   async mapFileToUrl ({ path, hostname }) {
     // Determine the URL by chopping off everything after the dollar sign
     const pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
-    const url = `${this.getBaseUrl(hostname)}${encodeURI(pathname)}`
+    const url = `${this.resolveUrl(hostname)}${encodeURI(pathname)}`
     return { url, contentType: this._getContentTypeByExtension(path) }
   }
 
@@ -77,15 +77,11 @@ class ResourceMapper {
     return !this._includeHost ? this._rootPath : `${this._rootPath}/${hostname}`
   }
 
-  // Gets the base URL for the given hostname
+  // Resolve a URL for the given hostname
   // Optionally, a pathname may be passed that will be appended to the baseUrl.
-  getBaseUrl (hostname, pathname) {
-    let baseUrl = !this._includeHost ? this._rootUrl
-                              : `${this._protocol}//${hostname}${this._port}${this._rootUrl}`
-    if (pathname) {
-      baseUrl += pathname
-    }
-    return baseUrl
+  resolveUrl (hostname, pathname = '') {
+    return !this._includeHost ? `${this._rootUrl}${pathname}`
+      : `${this._protocol}//${hostname}${this._port}${this._rootUrl}${pathname}`
   }
 
   // Determine the full file path corresponding to a URL

lib/utils.js

@@ -110,14 +110,6 @@ function serialize (graph, baseUri, contentType) {
 
 function translate (stream, baseUri, from, to) {
   return new Promise((resolve, reject) => {
-    // Handle Turtle Accept header
-    if (to === 'text/turtle' ||
-      to === 'text/n3' ||
-      to === 'application/turtle' ||
-      to === 'application/n3') {
-      to = 'text/turtle'
-    }
-
     let data = ''
     stream
       .on('data', function (chunk) {