Now fetching name given a webId

Author: megoth

bin/lib/updateIndex.js

@@ -3,10 +3,11 @@ const path = require('path')
 const cheerio = require('cheerio')
 const LDP = require('../../lib/ldp')
 const { URL } = require('url')
+const debug = require('../../lib/debug')
 
 const { compileTemplate, writeTemplate } = require('../../lib/common/template-utils')
 const { getAccountManager, loadConfig, loadUsernames } = require('./cli-utils')
-const { getWebId } = require('../../lib/common/user-utils')
+const { getName, getWebId } = require('../../lib/common/user-utils')
 const { initConfigDir, initTemplateDirs } = require('../../lib/server-config')
 
 module.exports = function (program) {
@@ -22,18 +23,23 @@ module.exports = function (program) {
       const ldp = new LDP(config)
       const accountManager = getAccountManager(config, { ldp })
       const usernames = loadUsernames(config)
-      const usersProcessed = usernames.map(async name => {
-        const accountDirectory = accountManager.accountDirFor(name)
+      const usersProcessed = usernames.map(async username => {
+        const accountDirectory = accountManager.accountDirFor(username)
         const indexFilePath = path.join(accountDirectory, 'index.html')
         if (!isUpdateAllowed(indexFilePath)) {
           return
         }
-        const accountUrl = getAccountUrl(name, config)
-        const webId = await getWebId(accountDirectory, accountUrl, { ldp })
-        writeTemplate(indexFilePath, indexTemplate, { name, webId })
+        const accountUrl = getAccountUrl(username, config)
+        try {
+          const webId = await getWebId(accountDirectory, accountUrl, { ldp })
+          const name = await getName(webId, { ldp })
+          writeTemplate(indexFilePath, indexTemplate, { name, webId })
+        } catch (err) {
+          debug.errors(`Failed to create new index for ${username}: ${JSON.stringify(err, null, 2)}`)
+        }
       })
       await Promise.all(usersProcessed)
-      console.log(`Processed ${usersProcessed.length} users`)
+      debug.accounts(`Processed ${usersProcessed.length} users`)
     })
 }
 

lib/common/user-utils.js

@@ -3,15 +3,21 @@ const $rdf = require('rdflib')
 const LDP = require('../ldp')
 
 const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
+const VCARD = $rdf.Namespace('http://www.w3.org/2006/vcard/ns#')
 
+module.exports.getName = getName
 module.exports.getWebId = getWebId
 module.exports.isValidUsername = isValidUsername
 
+async function getName (webId, options = {}) {
+  const ldp = setupLDP(options)
+  const graph = await ldp.fetchGraph(webId)
+  const nameNode = graph.any($rdf.sym(webId), VCARD('fn'))
+  return nameNode.value
+}
+
 async function getWebId (accountDirectory, accountUrl, options = {}) {
-  if (!options.ldp && !options.config) {
-    throw new Error('Require ldp or config set in options for getWebId')
-  }
-  const ldp = options.ldp || new LDP(options.config)
+  const ldp = setupLDP(options)
   const metaFileUri = `${accountUrl}/${ldp.suffixMeta}`
   const metaData = await ldp.readContainerMeta(accountDirectory)
   const metaGraph = $rdf.graph()
@@ -23,3 +29,10 @@ async function getWebId (accountDirectory, accountUrl, options = {}) {
 function isValidUsername (username) {
   return /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(username)
 }
+
+function setupLDP (options) {
+  if (!options.ldp && !options.config) {
+    throw new Error('Require ldp or config set in options for getWebId')
+  }
+  return options.ldp || new LDP(options.config)
+}

lib/ldp.js

@@ -273,7 +273,7 @@ class LDP {
    *
    * @return {Promise<Graph>}
    */
-  async fetchGraph (uri, options) {
+  async fetchGraph (uri, options = {}) {
     const response = await fetch(uri)
     if (!response.ok) {
       const error = new Error(