Refactor to use urls in case of encoding errors

Author: jaxoncreed

lib/ldp.js

@@ -18,8 +18,8 @@ const parse = require('./utils').parse
 const fetch = require('node-fetch')
 const { promisify } = require('util')
 const URL = require('url')
-const URI = require('urijs')
 const withLock = require('./lock')
+const utilPath = require('path')
 
 const RDF_MIME_TYPES = new Set([
   'text/turtle',            // .ttl
@@ -433,19 +433,16 @@ class LDP {
   }
 
   async getAvailableUrl (hostname, containerURI, { slug = uuid.v1(), extension }) {
-    const fileName = slug + extension
-    function ensureNotExists (self, newPath) {
-      // Verify whether the new path already exists
-      return self.exists(hostname, newPath).then(
-        // If it does, generate another one
-        () => ensureNotExists(self, URI.joinPaths(containerURI,
-                `${uuid.v1().split('-')[0]}-${fileName}`).toString()),
-        // If not, we found an appropriate path
-        () => newPath
-      )
+    let requestUrl = this.resourceMapper.resolveUrl(hostname, containerURI)
+    requestUrl.replace(/\/*$/, '/')
+
+    const { path: containerFilePath } = await this.resourceMapper.mapUrlToFile({ url: requestUrl })
+    let fileName = slug + extension
+    if (fs.existsSync(utilPath.join(containerFilePath, fileName))) {
+      fileName = `${uuid.v1()}-${fileName}`
     }
-    const relativePath = await ensureNotExists(this, URI.joinPaths(containerURI, fileName).toString())
-    return this.resourceMapper.resolveUrl(hostname, relativePath)
+
+    return requestUrl + fileName
   }
 
   getTrustedOrigins (req) {