Make the quota functions async

Author: kjetilk

lib/utils.js

@@ -251,19 +251,23 @@ function routeResolvedFile (router, path, file, appendFileName = true) {
  * may store or Infinity if no limit
  */
 
-function getQuota (root, serverUri) {
+async function getQuota (root, serverUri) {
   const filename = path.join(root, 'settings/serverSide.ttl')
   var quota = Infinity
   var prefs
   try {
-    prefs = fs.readFileSync(filename, 'utf8')
+    prefs = await _asyncReadfile(filename)
   } catch (error) {
     debug('Setting no quota. While reading serverSide.ttl, got ' + error)
     return Infinity
   }
   var graph = $rdf.graph()
   const storageUri = serverUri + '/'
-  $rdf.parse(prefs, graph, storageUri, 'text/turtle')
+  try {
+    $rdf.parse(prefs, graph, storageUri, 'text/turtle')
+  } catch (error) {
+    throw new Error('Failed to parse serverSide.ttl, got ' + error)
+  }
   const lit = graph.each($rdf.sym(storageUri), ns.solid('storageQuota'), undefined)[0]
   if (lit) {
     quota = lit.value
@@ -285,17 +289,19 @@ function getQuota (root, serverUri) {
 }
 
 async function overQuota (root, serverUri) {
-  let quota = getQuota(root, serverUri)
+  let quota = await getQuota(root, serverUri)
   console.log(root, quota)
   if (quota === Infinity) {
     return false
   }
   var actualSize = await _asyncGetSize(root)
-  console.log(actualSize, quota)
   return (actualSize > quota)
 }
 
 function _asyncGetSize (root) {
   return util.promisify(getSize)(root)
 }
 
+function _asyncReadfile (filename) {
+  return util.promisify(fs.readFile)(filename, 'utf-8')
+}