Add lock on get.

Author: RubenVerborgh

lib/ldp.js

@@ -91,10 +91,6 @@ class LDP {
     })
   }
 
-  createReadStream (path, start, end) {
-    return fs.createReadStream(path, start && end && {start, end})
-  }
-
   async readResource (url) {
     let releaseLock
     try {
@@ -377,7 +373,6 @@ class LDP {
       // This forces one more translation turtle -> desired
       return { stream, contentType: 'text/turtle', container: true }
     } else {
-      let stream
       let chunksize, contentRange, start, end
       if (options.range) {
         const total = fs.statSync(path).size
@@ -389,18 +384,26 @@ class LDP {
         chunksize = (end - start) + 1
         contentRange = 'bytes ' + start + '-' + end + '/' + total
       }
-      stream = this.createReadStream(path)
-      return new Promise((resolve, reject) => {
-        stream
-          .on('error', function (err) {
-            debug.handlers(`GET -- error reading ${path}: ${err.message}`)
-            return reject(error(err, "Can't read file " + err))
-          })
-          .on('open', function () {
-            debug.handlers(`GET -- Reading ${path}`)
-            return resolve({ stream, contentType, container: false, contentRange, chunksize })
-          })
-      })
+      let releaseLock
+      try {
+        releaseLock = await lock(path, { retries: 10 })
+        return await new Promise((resolve, reject) => {
+          const stream = fs.createReadStream(path, start && end && {start, end})
+          stream
+            .on('error', function (err) {
+              debug.handlers(`GET -- error reading ${path}: ${err.message}`)
+              return reject(error(err, "Can't read file " + err))
+            })
+            .on('open', function () {
+              debug.handlers(`GET -- Reading ${path}`)
+              return resolve({ stream, contentType, container: false, contentRange, chunksize })
+            })
+        })
+      } finally {
+        if (releaseLock) {
+          await releaseLock()
+        }
+      }
     }
   }