solid-server 5.8.6 → 5.8.8-22f4cfec

package/bin/lib/{start.js → start.mjs}

@@ -1,148 +1,124 @@
-'use strict'
-
-const options = require('./options')
-const fs = require('fs')
-const path = require('path')
-const { loadConfig } = require('./cli-utils')
-const { red, bold } = require('colorette')
-
-module.exports = function (program, server) {
-  const start = program
-    .command('start')
-    .description('run the Solid server')
-
-  options
-    .filter((option) => !option.hide)
-    .forEach((option) => {
-      const configName = option.name.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase())
-      const snakeCaseName = configName.replace(/([A-Z])/g, '_$1')
-      const envName = `SOLID_${snakeCaseName.toUpperCase()}`
-
-      let name = '--' + option.name
-      if (!option.flag) {
-        name += ' [value]'
-      }
-
-      if (process.env[envName]) {
-        const raw = process.env[envName]
-        const envValue = /^(true|false)$/.test(raw) ? raw === 'true' : raw
-
-        start.option(name, option.help, envValue)
-      } else {
-        start.option(name, option.help)
-      }
-    })
-
-  start.option('-q, --quiet', 'Do not print the logs to console')
-
-  start.action(async (options) => {
-    const config = loadConfig(program, options)
-    bin(config, server)
-  })
-}
-
-function bin (argv, server) {
-  if (!argv.email) {
-    argv.email = {
-      host: argv.emailHost,
-      port: argv.emailPort,
-      secure: true,
-      auth: {
-        user: argv.emailAuthUser,
-        pass: argv.emailAuthPass
-      }
-    }
-    delete argv.emailHost
-    delete argv.emailPort
-    delete argv.emailAuthUser
-    delete argv.emailAuthPass
-  }
-
-  if (!argv.tokenTypesSupported) {
-    argv.tokenTypesSupported = ['legacyPop', 'dpop']
-  }
-
-  // Set up --no-*
-  argv.live = !argv.noLive
-
-  // Set up debug environment
-  if (!argv.quiet) {
-    require('debug').enable('solid:*')
-  }
-
-  // Set up port
-  argv.port = argv.port || 3456
-
-  // Multiuser with no webid is not allowed
-
-  // Webid to be default in command line
-  if (argv.webid !== false) {
-    argv.webid = true
-  }
-
-  if (!argv.webid && argv.multiuser) {
-    throw new Error('Server cannot operate as multiuser without webids')
-  }
-
-  // Signal handling (e.g. CTRL+C)
-  if (process.platform !== 'win32') {
-    // Signal handlers don't work on Windows.
-    process.on('SIGINT', function () {
-      console.log('\nSolid stopped.')
-      process.exit()
-    })
-  }
-
-  // Overwrite root .acl if owner is specified
-  if (argv.owner) {
-    let rootPath = path.resolve(argv.root || process.cwd())
-    if (!(rootPath.endsWith('/'))) {
-      rootPath += '/'
-    }
-    rootPath += (argv.suffixAcl || '.acl')
-
-    const defaultAcl = `@prefix n0: <http://www.w3.org/ns/auth/acl#>.
-  @prefix n2: <http://xmlns.com/foaf/0.1/>.
-
-  <#owner>
-     a                 n0:Authorization;
-     n0:accessTo       <./>;
-     n0:agent          <${argv.owner}>;
-     n0:default        <./>;
-     n0:mode           n0:Control, n0:Read, n0:Write.
-  <#everyone>
-     a                 n0:Authorization;
-     n0:               n2:Agent;
-     n0:accessTo       <./>;
-     n0:default        <./>;
-     n0:mode           n0:Read.`
-
-    fs.writeFileSync(rootPath, defaultAcl)
-  }
-
-  // // Finally starting solid
-  const solid = require('../../')
-  let app
-  try {
-    app = solid.createServer(argv, server)
-  } catch (e) {
-    if (e.code === 'EACCES') {
-      if (e.syscall === 'mkdir') {
-        console.log(red(bold('ERROR')), `You need permissions to create '${e.path}' folder`)
-      } else {
-        console.log(red(bold('ERROR')), 'You need root privileges to start on this port')
-      }
-      return 1
-    }
-    if (e.code === 'EADDRINUSE') {
-      console.log(red(bold('ERROR')), 'The port ' + argv.port + ' is already in use')
-      return 1
-    }
-    console.log(red(bold('ERROR')), e.message)
-    return 1
-  }
-  app.listen(argv.port, function () {
-    console.log(`Solid server (${argv.version}) running on \u001b[4mhttps://localhost:${argv.port}/\u001b[0m`)
-    console.log('Press <ctrl>+c to stop')
-  })
-}
+import options from './options.mjs'
+import fs from 'fs'
+import path from 'path'
+import { loadConfig } from './cli-utils.mjs'
+import { red, bold } from 'colorette'
+
+export default function (program, server) {
+  const start = program
+    .command('start')
+    .description('run the Solid server')
+
+  options
+    .filter((option) => !option.hide)
+    .forEach((option) => {
+      const configName = option.name.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase())
+      const snakeCaseName = configName.replace(/([A-Z])/g, '_$1')
+      const envName = `SOLID_${snakeCaseName.toUpperCase()}`
+      let name = '--' + option.name
+      if (!option.flag) {
+        name += ' [value]'
+      }
+      if (process.env[envName]) {
+        const raw = process.env[envName]
+        const envValue = /^(true|false)$/.test(raw) ? raw === 'true' : raw
+        start.option(name, option.help, envValue)
+      } else {
+        start.option(name, option.help)
+      }
+    })
+
+  start.option('-q, --quiet', 'Do not print the logs to console')
+
+  start.action(async (options) => {
+    const config = loadConfig(program, options)
+    await bin(config, server)
+  })
+}
+
+async function bin (argv, server) {
+  if (!argv.email) {
+    argv.email = {
+      host: argv.emailHost,
+      port: argv.emailPort,
+      secure: true,
+      auth: {
+        user: argv.emailAuthUser,
+        pass: argv.emailAuthPass
+      }
+    }
+    delete argv.emailHost
+    delete argv.emailPort
+    delete argv.emailAuthUser
+    delete argv.emailAuthPass
+  }
+  if (!argv.tokenTypesSupported) {
+    argv.tokenTypesSupported = ['legacyPop', 'dpop']
+  }
+  argv.live = !argv.noLive
+  if (!argv.quiet) {
+    const debug = await import('debug')
+    debug.default.enable('solid:*')
+  }
+  argv.port = argv.port || 3456
+  if (argv.webid !== false) {
+    argv.webid = true
+  }
+  if (!argv.webid && argv.multiuser) {
+    throw new Error('Server cannot operate as multiuser without webids')
+  }
+  if (process.platform !== 'win32') {
+    process.on('SIGINT', function () {
+      console.log('\nSolid stopped.')
+      process.exit()
+    })
+  }
+  if (argv.owner) {
+    let rootPath = path.resolve(argv.root || process.cwd())
+    if (!(rootPath.endsWith('/'))) {
+      rootPath += '/'
+    }
+    rootPath += (argv.suffixAcl || '.acl')
+    const defaultAcl = `@prefix n0: <http://www.w3.org/ns/auth/acl#>.
+  @prefix n2: <http://xmlns.com/foaf/0.1/>.
+
+  <#owner>
+     a                 n0:Authorization;
+     n0:accessTo       <./>;
+     n0:agent          <${argv.owner}>;
+     n0:default        <./>;
+     n0:mode           n0:Control, n0:Read, n0:Write.
+  <#everyone>
+     a                 n0:Authorization;
+     n0:               n2:Agent;
+     n0:accessTo       <./>;
+     n0:default        <./>;
+     n0:mode           n0:Read.`
+    fs.writeFileSync(rootPath, defaultAcl)
+  }
+  const solid = (await import('../../index.mjs')).default
+  let app
+  try {
+    app = solid.createServer(argv, server)
+  } catch (e) {
+    if (e.code === 'EACCES') {
+      if (e.syscall === 'mkdir') {
+        console.log(red(bold('ERROR')), `You need permissions to create '${e.path}' folder`)
+      } else {
+        console.log(red(bold('ERROR')), 'You need root privileges to start on this port')
+      }
+      return 1
+    }
+    if (e.code === 'EADDRINUSE') {
+      console.log(red(bold('ERROR')), 'The port ' + argv.port + ' is already in use')
+      return 1
+    }
+    console.log(red(bold('ERROR')), e.message)
+    return 1
+  }
+  app.listen(argv.port, function () {
+    console.log('ESM Solid server')
+    console.log(`Solid server (${argv.version}) running on \u001b[4mhttps://localhost:${argv.port}/\u001b[0m`)
+    console.log('Press <ctrl>+c to stop')
+  })
+}

package/bin/lib/{updateIndex.js → updateIndex.mjs}

@@ -1,56 +1,55 @@
-const fs = require('fs')
-const path = require('path')
-const cheerio = require('cheerio')
-const LDP = require('../../lib/ldp')
-const { URL } = require('url')
-const debug = require('../../lib/debug')
-const { readFile } = require('../../lib/common/fs-utils')
-
-const { compileTemplate, writeTemplate } = require('../../lib/common/template-utils')
-const { loadConfig, loadAccounts } = require('./cli-utils')
-const { getName, getWebId } = require('../../lib/common/user-utils')
-const { initConfigDir, initTemplateDirs } = require('../../lib/server-config')
-
-module.exports = function (program) {
-  program
-    .command('updateindex')
-    .description('Update index.html in root of all PODs that haven\'t been marked otherwise')
-    .action(async (options) => {
-      const config = loadConfig(program, options)
-      const configPath = initConfigDir(config)
-      const templates = initTemplateDirs(configPath)
-      const indexTemplatePath = path.join(templates.account, 'index.html')
-      const indexTemplate = await compileTemplate(indexTemplatePath)
-      const ldp = new LDP(config)
-      const accounts = loadAccounts(config)
-      const usersProcessed = accounts.map(async account => {
-        const accountDirectory = path.join(config.root, account)
-        const indexFilePath = path.join(accountDirectory, '/index.html')
-        if (!isUpdateAllowed(indexFilePath)) {
-          return
-        }
-        const accountUrl = getAccountUrl(account, config)
-        try {
-          const webId = await getWebId(accountDirectory, accountUrl, ldp.suffixMeta, (filePath) => readFile(filePath))
-          const name = await getName(webId, ldp.fetchGraph)
-          writeTemplate(indexFilePath, indexTemplate, { name, webId })
-        } catch (err) {
-          debug.errors(`Failed to create new index for ${account}: ${JSON.stringify(err, null, 2)}`)
-        }
-      })
-      await Promise.all(usersProcessed)
-      debug.accounts(`Processed ${usersProcessed.length} users`)
-    })
-}
-
-function getAccountUrl (name, config) {
-  const serverUrl = new URL(config.serverUri)
-  return `${serverUrl.protocol}//${name}.${serverUrl.host}/`
-}
-
-function isUpdateAllowed (indexFilePath) {
-  const indexSource = fs.readFileSync(indexFilePath, 'utf-8')
-  const $ = cheerio.load(indexSource)
-  const allowAutomaticUpdateValue = $('meta[name="solid-allow-automatic-updates"]').prop('content')
-  return !allowAutomaticUpdateValue || allowAutomaticUpdateValue === 'true'
-}
+import fs from 'fs'
+import path from 'path'
+import * as cheerio from 'cheerio'
+import LDP from '../../lib/ldp.mjs'
+import { URL } from 'url'
+import debug from '../../lib/debug.mjs'
+import { readFile } from '../../lib/common/fs-utils.mjs'
+import { compileTemplate, writeTemplate } from '../../lib/common/template-utils.mjs'
+import { loadConfig, loadAccounts } from './cli-utils.mjs'
+import { getName, getWebId } from '../../lib/common/user-utils.mjs'
+import { initConfigDir, initTemplateDirs } from '../../lib/server-config.mjs'
+
+export default function (program) {
+  program
+    .command('updateindex.mjs')
+    .description('Update index.html in root of all PODs that haven\'t been marked otherwise')
+    .action(async (options) => {
+      const config = loadConfig(program, options)
+      const configPath = initConfigDir(config)
+      const templates = initTemplateDirs(configPath)
+      const indexTemplatePath = path.join(templates.account, 'index.html')
+      const indexTemplate = await compileTemplate(indexTemplatePath)
+      const ldp = new LDP(config)
+      const accounts = loadAccounts(config)
+      const usersProcessed = accounts.map(async account => {
+        const accountDirectory = path.join(config.root, account)
+        const indexFilePath = path.join(accountDirectory, '/index.html')
+        if (!isUpdateAllowed(indexFilePath)) {
+          return
+        }
+        const accountUrl = getAccountUrl(account, config)
+        try {
+          const webId = await getWebId(accountDirectory, accountUrl, ldp.suffixMeta, (filePath) => readFile(filePath))
+          const name = await getName(webId, ldp.fetchGraph)
+          writeTemplate(indexFilePath, indexTemplate, { name, webId })
+        } catch (err) {
+          debug.errors(`Failed to create new index for ${account}: ${JSON.stringify(err, null, 2)}`)
+        }
+      })
+      await Promise.all(usersProcessed)
+      debug.accounts(`Processed ${usersProcessed.length} users`)
+    })
+}
+
+function getAccountUrl (name, config) {
+  const serverUrl = new URL(config.serverUri)
+  return `${serverUrl.protocol}//${name}.${serverUrl.host}/`
+}
+
+function isUpdateAllowed (indexFilePath) {
+  const indexSource = fs.readFileSync(indexFilePath, 'utf-8')
+  const $ = cheerio.load(indexSource)
+  const allowAutomaticUpdateValue = $('meta[name="solid-allow-automatic-updates"]').prop('content')
+  return !allowAutomaticUpdateValue || allowAutomaticUpdateValue === 'true'
+}

package/bin/solid

@@ -1,3 +1,3 @@
-#!/usr/bin/env -S node --experimental-require-module
-const startCli = require('./lib/cli')
+#!/usr/bin/env node
+import startCli from './lib/cli.mjs'
 startCli()