solid-server 5.7.10 → 5.8.0

package/.github/workflows/ci.yml

@@ -17,17 +17,30 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [ '>=20.17.0' ]
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+
+    # extract repository name
+    - if: github.event_name == 'pull_request'
+      run: echo "REPO_NAME=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV
+
+    - if: github.event_name != 'pull_request'
+      run: echo "REPO_NAME=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
+
     # extract branch name
     - if: github.event_name == 'pull_request'
       run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
+
     - if: github.event_name != 'pull_request'
       run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
 
+    # print repository name
+    - name: Get repository name
+      run: echo 'The repository name is' $REPO_NAME
+
     # print branch name
     - name: Get branch name
       run: echo 'The branch name is' $BRANCH_NAME
@@ -40,12 +53,12 @@ jobs:
     # test code
     - run: npm run standard
     - run: npm run validate
-    - run: npm run nyc
+    - run: npm run c8
     # Test global install of the package
     - run: npm pack .
     - run: npm install -g solid-server-*.tgz
     # Run the Solid test-suite
-    - run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME
+    - run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME $REPO_NAME
 
   # TODO: The pipeline should automate publication to npm, so that the docker build gets the correct version
   #       This job will only dockerize solid-server@latest / solid-server@<tag-name> from npmjs.com!
@@ -56,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: olegtarasov/get-tag@v2.1
         id: tagName

package/README.md

@@ -138,7 +138,7 @@ Your users will have a dedicated folder under `./data` at `./data/<username>.<yo
 > To use Gmail you may need to configure ["Allow Less Secure Apps"](https://www.google.com/settings/security/lesssecureapps) in your Gmail account unless you are using 2FA in which case you would have to create an [Application Specific](https://security.google.com/settings/security/apppasswords) password. You also may need to unlock your account with ["Allow access to your Google account"](https://accounts.google.com/DisplayUnlockCaptcha) to use SMTP.
 
 also add to `config.json`
-``` 
+```
   "useEmail": true,
   "emailHost": "smtp.gmail.com",
   "emailPort": "465",
@@ -206,6 +206,7 @@ $ solid start --help
     --multiuser                   Enable multi-user mode
     --idp [value]                 Obsolete; use --multiuser
     --no-live                     Disable live support through WebSockets
+    --no-prep                     Disable Per Resource Events
     --proxy [value]               Obsolete; use --corsProxy
     --cors-proxy [value]          Serve the CORS proxy on this path
     --suppress-data-browser       Suppress provision of a data browser
@@ -271,7 +272,7 @@ docker run -p 8443:8443 --name solid node-solid-server
 
 
 This will enable you to login to solid on https://localhost:8443 and then create a new account
-but not yet use that account. After a new account is made you will need to create an entry for 
+but not yet use that account. After a new account is made you will need to create an entry for
 it in your local (/etc/)hosts file in line with the account and subdomain, i.e. --
 
 ```pre
@@ -280,16 +281,16 @@ it in your local (/etc/)hosts file in line with the account and subdomain, i.e.
 
 You can modify the config within the docker container as follows:
 
- - Copy the `config.json` to the current directory with: 
+ - Copy the `config.json` to the current directory with:
    ```bash
    docker cp solid:/usr/src/app/config.json .
    ```
  - Edit the `config.json` file
- - Copy the file back with 
+ - Copy the file back with
    ```bash
    docker cp config.json solid:/usr/src/app/
    ```
- - Restart the server with 
+ - Restart the server with
    ```bash
    docker restart solid
    ```

package/bin/lib/options.js

@@ -143,6 +143,12 @@ module.exports = [
     flag: true,
     default: false
   },
+  {
+    name: 'no-prep',
+    help: 'Disable Per Resource Events',
+    flag: true,
+    default: false
+  },
   // {
   //   full: 'default-app',
   //   help: 'URI to use as a default app for resources (default: https://linkeddata.github.io/warp/#/list/)'

package/bin/solid

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

package/bin/solid.js

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

package/common/js/index-buttons.js

@@ -30,7 +30,7 @@ document.addEventListener('DOMContentLoaded', async function() {
         //     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
         else {
         let loginArea = document.getElementById('loginStatusArea');
-        let html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button">`
+        let html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button" style="padding: 1em; border-radius:0.2em; font-size: 100%;margin: 0.75em 0 0.75em 0.5em !important; padding: 0.5em !important;background-color: #efe;">`
         let span = document.createElement("span")
         span.innerHTML = html
         loginArea.appendChild(span);
@@ -41,4 +41,4 @@ document.addEventListener('DOMContentLoaded', async function() {
         signUpButton.style.display = "none";
         }                    
     }
-})
+})

package/lib/create-app.js

@@ -28,6 +28,11 @@ const ResourceMapper = require('./resource-mapper')
 const aclCheck = require('@solid/acl-check')
 const { version } = require('../package.json')
 
+const acceptEvents = require('express-accept-events').default
+const events = require('express-negotiate-events').default
+const eventID = require('express-prep/event-id').default
+const prep = require('express-prep').default
+
 const corsSettings = cors({
   methods: [
     'OPTIONS', 'HEAD', 'GET', 'PATCH', 'POST', 'PUT', 'DELETE'
@@ -61,6 +66,12 @@ function createApp (argv = {}) {
 
   const app = express()
 
+  // Add PREP support
+  if (argv.prep) {
+    app.use(eventID)
+    app.use(acceptEvents, events, prep)
+  }
+
   initAppLocals(app, argv, ldp)
   initHeaders(app)
   initViews(app, configPath)
@@ -115,7 +126,7 @@ function createApp (argv = {}) {
   }
 
   // Attach the LDP middleware
-  app.use('/', LdpMiddleware(corsSettings))
+  app.use('/', LdpMiddleware(corsSettings, argv.prep))
 
   // https://stackoverflow.com/questions/51741383/nodejs-express-return-405-for-un-supported-method
   app.use(function (req, res, next) {
@@ -168,6 +179,7 @@ function initAppLocals (app, argv, ldp) {
   app.locals.enforceToc = argv.enforceToc
   app.locals.tocUri = argv.tocUri
   app.locals.disablePasswordChecks = argv.disablePasswordChecks
+  app.locals.prep = argv.prep
 
   if (argv.email && argv.email.host) {
     app.locals.emailService = new EmailService(argv.templates.email, argv.email)
@@ -287,7 +299,7 @@ function initWebId (argv, app, ldp) {
   initAuthentication(app, argv)
 
   if (argv.multiuser) {
-    app.use(vhost('*', LdpMiddleware(corsSettings)))
+    app.use(vhost('*', LdpMiddleware(corsSettings, argv.prep)))
   }
 }
 

package/lib/debug.js

@@ -15,3 +15,4 @@ exports.accounts = debug('solid:accounts')
 exports.email = debug('solid:email')
 exports.ldp = debug('solid:ldp')
 exports.fs = debug('solid:fs')
+exports.prep = debug('solid:prep')

package/lib/handlers/delete.js

@@ -6,9 +6,12 @@ async function handler (req, res, next) {
   debug('DELETE -- Request on' + req.originalUrl)
 
   const ldp = req.app.locals.ldp
+  const prep = req.app.locals.prep
   try {
     await ldp.delete(req)
     debug('DELETE -- Ok.')
+    // Add event-id for notifications
+    prep && res.setHeader('Event-ID', res.setEventID())
     res.sendStatus(200)
     next()
   } catch (err) {

package/lib/handlers/get.js

@@ -17,9 +17,13 @@ const translate = require('../utils.js').translate
 const error = require('../http-error')
 
 const RDFs = require('../ldp').mimeTypesAsArray()
+const isRdf = require('../ldp').mimeTypeIsRdf
+
+const prepConfig = 'accept=("message/rfc822" "application/ld+json" "text/turtle")'
 
 async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
+  const prep = req.app.locals.prep
   const includeBody = req.method === 'GET'
   const negotiator = new Negotiator(req)
   const baseUri = ldp.resourceMapper.resolveUrl(req.hostname, req.path)
@@ -103,7 +107,7 @@ async function handler (req, res, next) {
       debug('   sending data browser file: ' + dataBrowserPath)
       res.sendFile(dataBrowserPath)
       return
-    } else if (stream) {
+    } else if (stream) { // EXIT text/html
       res.setHeader('Content-Type', contentType)
       return stream.pipe(res)
     }
@@ -111,14 +115,27 @@ async function handler (req, res, next) {
 
   // If request accepts the content-type we found
   if (stream && negotiator.mediaType([contentType])) {
-    res.setHeader('Content-Type', contentType)
+    let headers = {
+      'Content-Type': contentType
+    }
     if (contentRange) {
-      const headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }
-      res.writeHead(206, headers)
-      return stream.pipe(res)
-    } else {
-      return stream.pipe(res)
+      headers = {
+        ...headers,
+        'Content-Range': contentRange,
+        'Accept-Ranges': 'bytes',
+        'Content-Length': chunksize
+      }
+      res.statusCode = 206
     }
+
+    if (prep & isRdf(contentType) && !res.sendEvents({
+      config: { prep: prepConfig },
+      body: stream,
+      isBodyStream: true,
+      headers
+    })) return
+    res.set(headers)
+    return stream.pipe(res)
   }
 
   // If it is not in our RDFs we can't even translate,
@@ -130,6 +147,14 @@ async function handler (req, res, next) {
     // Translate from the contentType found to the possibleRDFType desired
     const data = await translate(stream, baseUri, contentType, possibleRDFType)
     debug(req.originalUrl + ' translating ' + contentType + ' -> ' + possibleRDFType)
+    const headers = {
+      'Content-Type': possibleRDFType
+    }
+    if (prep && isRdf(contentType) && !res.sendEvents({
+      config: { prep: prepConfig },
+      body: data,
+      headers
+    })) return
     res.setHeader('Content-Type', possibleRDFType)
     res.send(data)
     return next()

package/lib/handlers/notify.js

@@ -0,0 +1,130 @@
+module.exports = handler
+
+const libPath = require('path/posix')
+
+const headerTemplate = require('express-prep/templates').header
+const solidRDFTemplate = require('../rdf-notification-template')
+const debug = require('../debug').prep
+
+const ALLOWED_RDF_MIME_TYPES = [
+  'application/ld+json',
+  'application/activity+json',
+  'text/turtle'
+]
+
+function getParent (path) {
+  if (path === '' || path === '/') return
+  const parent = libPath.dirname(path)
+  return parent === '/' ? '/' : `${parent}/`
+}
+
+function getActivity (method, path) {
+  if (method === 'DELETE') {
+    return 'Delete'
+  }
+  if (method === 'POST' && path.endsWith('/')) {
+    return 'Add'
+  }
+  return 'Update'
+}
+
+function getParentActivity (method, status) {
+  if (method === 'DELETE') {
+    return 'Remove'
+  }
+  if (status === 201) {
+    return 'Add'
+  }
+  return 'Update'
+}
+
+function handler (req, res, next) {
+  const { trigger, defaultNotification } = res.events.prep
+
+  const { method, path } = req
+  const { statusCode } = res
+  const eventID = res.getHeader('event-id')
+  const fullUrl = new URL(path, `${req.protocol}://${req.hostname}/`)
+
+  // Date is a hack since node does not seem to provide access to send date.
+  // Date needs to be shared with parent notification
+  const eventDate = res._header.match(/^Date: (.*?)$/m)?.[1] ||
+    new Date().toUTCString()
+
+  // If the resource itself newly created,
+  // it could not have been subscribed for notifications already
+  if (!((method === 'PUT' || method === 'PATCH') && statusCode === 201)) {
+    try {
+      trigger({
+        generateNotification (
+          negotiatedFields
+        ) {
+          const mediaType = negotiatedFields['content-type']
+          const activity = getActivity(method, path)
+          const target = activity === 'Add'
+            ? res.getHeader('location')
+            : undefined
+          if (ALLOWED_RDF_MIME_TYPES.includes(mediaType?.[0])) {
+            return `${headerTemplate(negotiatedFields)}\r\n${solidRDFTemplate({
+              activity,
+              eventID,
+              object: String(fullUrl),
+              target,
+              date: eventDate,
+              // We use eTag as a proxy for state for now
+              state: res.getHeader('ETag'),
+              mediaType
+            })}`
+          } else {
+            return defaultNotification()
+          }
+        }
+      })
+    } catch (error) {
+      debug(`Failed to trigger notification on route ${fullUrl}`)
+      // No special handling is necessary since the resource mutation was
+      // already successful. The purpose of this block is to prevent Express
+      // from triggering error handling middleware when notifications fail.
+      // An error notification might be sent in the future.
+    }
+  }
+
+  // Write a notification to parent container
+  // POST in Solid creates a child resource
+  const parent = getParent(path)
+  if (parent && method !== 'POST') {
+    const parentID = res.setEventID(parent)
+    const parentUrl = new URL(parent, fullUrl)
+    try {
+      trigger({
+        path: parent,
+        generateNotification (
+          negotiatedFields
+        ) {
+          const mediaType = negotiatedFields['content-type']
+          const activity = getParentActivity(method, statusCode)
+          const target = activity !== 'Update' ? String(fullUrl) : undefined
+          if (ALLOWED_RDF_MIME_TYPES.includes(mediaType?.[0])) {
+            return `${headerTemplate(negotiatedFields)}\r\n${solidRDFTemplate({
+              activity,
+              eventID: parentID,
+              date: eventDate,
+              object: String(parentUrl),
+              target,
+              eTag: undefined,
+              mediaType
+            })}`
+          }
+        }
+      })
+    } catch (error) {
+      debug(`Failed to trigger notification on parent route ${parentUrl}`)
+      // No special handling is necessary since the resource mutation was
+      // already successful. The purpose of this block is to prevent Express
+      // from triggering error handling middleware when notifications fail.
+      // An error notification might be sent in the future.
+    }
+  }
+
+  next()
+}

package/lib/handlers/patch.js

@@ -39,6 +39,7 @@ function contentForNew (contentType) {
 // Handles a PATCH request
 async function patchHandler (req, res, next) {
   debug(`PATCH -- ${req.originalUrl}`)
+  const prep = req.app.locals.prep
   try {
     // Obtain details of the target resource
     const ldp = req.app.locals.ldp
@@ -91,7 +92,10 @@ async function patchHandler (req, res, next) {
       return writeGraph(graph, resource, ldp.resourceMapper.resolveFilePath(req.hostname), ldp.serverUri)
     })
 
-    // Send the result to the client
+    // Add event-id for notifications
+    prep && res.setHeader('Event-ID', res.setEventID())
+    // Send the status and result to the client
+    res.status(resourceExists ? 200 : 201)
     res.send(result)
   } catch (err) {
     return next(err)

package/lib/handlers/post.js

@@ -11,6 +11,7 @@ const getContentType = require('../utils').getContentType
 
 async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
+  const prep = req.app.locals.prep
   const contentType = getContentType(req.headers)
   debug('content-type is ', contentType)
   // Handle SPARQL(-update?) query
@@ -72,6 +73,8 @@ async function handler (req, res, next) {
     // Handled by backpressure of streams!
     busboy.on('finish', function () {
       debug('Done storing files')
+      // Add event-id for notifications
+      prep && res.setHeader('Event-ID', res.setEventID())
       res.sendStatus(200)
       next()
     })
@@ -91,6 +94,8 @@ async function handler (req, res, next) {
         debug('File stored in ' + resourcePath)
         header.addLinks(res, links)
         res.set('Location', resourcePath)
+        // Add event-id for notifications
+        prep && res.setHeader('Event-ID', res.setEventID())
         res.sendStatus(201)
         next()
       },

package/lib/handlers/put.js

@@ -59,6 +59,7 @@ async function checkPermission (request, resourceExists) {
 // TODO could be renamed as putResource (it now covers container and non-container)
 async function putStream (req, res, next, stream = req) {
   const ldp = req.app.locals.ldp
+  const prep = req.app.locals.prep
   // try {
   // Obtain details of the target resource
   let resourceExists = true
@@ -77,7 +78,9 @@ async function putStream (req, res, next, stream = req) {
     // Fails with Append on existing resource
     if (!req.originalUrl.endsWith('.acl')) await checkPermission(req, resourceExists)
     await ldp.put(req, stream, getContentType(req.headers))
-    res.sendStatus(201)
+    // Add event-id for notifications
+    prep && res.setHeader('Event-ID', res.setEventID())
+    res.sendStatus(resourceExists ? 204 : 201)
     return next()
   } catch (err) {
     err.message = 'Can\'t write file/folder: ' + err.message

package/lib/ldp-middleware.js

@@ -10,8 +10,9 @@ const del = require('./handlers/delete')
 const patch = require('./handlers/patch')
 const index = require('./handlers/index')
 const copy = require('./handlers/copy')
+const notify = require('./handlers/notify')
 
-function LdpMiddleware (corsSettings) {
+function LdpMiddleware (corsSettings, prep) {
   const router = express.Router('/')
 
   // Add Link headers
@@ -28,5 +29,12 @@ function LdpMiddleware (corsSettings) {
   router.put('/*', allow('Append'), put)
   router.delete('/*', allow('Write'), del)
 
+  if (prep) {
+    router.post('/*', notify)
+    router.patch('/*', notify)
+    router.put('/*', notify)
+    router.delete('/*', notify)
+  }
+
   return router
 }

package/lib/ldp.js

@@ -103,7 +103,6 @@ class LDP {
 
   async listContainer (container, reqUri, containerData, hostname) {
     const resourceGraph = $rdf.graph()
-
     try {
       $rdf.parse(containerData, resourceGraph, reqUri, 'text/turtle')
     } catch (err) {
@@ -220,19 +219,16 @@ class LDP {
 
   async put (url, stream, contentType) {
     const container = (url.url || url).endsWith('/')
-
     // PUT without content type is forbidden, unless PUTting container
     if (!contentType && !container) {
       throw error(400,
         'PUT request requires a content-type via the Content-Type header')
     }
-
     // reject resource with percent-encoded $ extension
     const dollarExtensionRegex = /%(?:24)\.[^%(?:24)]*$/ // /\$\.[^$]*$/
     if ((url.url || url).match(dollarExtensionRegex)) {
       throw error(400, 'Resource with a $.ext is not allowed by the server')
     }
-
     // First check if we are above quota
     let isOverQuota
     // Someone had a reason to make url actually a req sometimes but not
@@ -246,34 +242,27 @@ class LDP {
     if (isOverQuota) {
       throw error(413, 'User has exceeded their storage quota')
     }
+    // Set url using folder/.meta
+    let { path } = await this.resourceMapper.mapUrlToFile({
+      url,
+      contentType,
+      createIfNotExists: true,
+      searchIndex: false
+    })
 
-    // Set url using folder/.meta. This is Hack to find folder path
-    if (container) {
-      if (typeof url !== 'string') {
-        url.url = url.url + suffixMeta
-      } else {
-        url = url + suffixMeta
-      }
-      contentType = 'text/turtle'
-    }
-
-    const { path } = await this.resourceMapper.mapUrlToFile({ url, contentType, createIfNotExists: true })
+    if (container) { path += suffixMeta }
     // debug.handlers(container + ' item ' + (url.url || url) + ' ' + contentType + ' ' + path)
     // check if file exists, and in that case that it has the same extension
     if (!container) { await this.checkFileExtension(url, path) }
-
     // Create the enclosing directory, if necessary, do not create pubsub if PUT create container
     await this.createDirectory(path, hostname, !container)
-
     // clear cache
     if (path.endsWith(this.suffixAcl)) {
       const { url: aclUrl } = await this.resourceMapper.mapFileToUrl({ path, hostname })
       clearAclCache(aclUrl)
       // clearAclCache()
     }
-
     // Directory created, now write the file
-    if (container) return
     return withLock(path, () => new Promise((resolve, reject) => {
       // HACK: the middleware in webid-oidc.js uses body-parser, thus ending the stream of data
       // for JSON bodies. So, the stream needs to be reset

package/lib/models/account-manager.js

@@ -89,12 +89,10 @@ class AccountManager {
     try {
       accountUri = this.accountUriFor(accountName)
       accountUri = url.parse(accountUri).hostname
-
       cardPath = url.resolve('/', this.pathCard)
     } catch (err) {
       return Promise.reject(err)
     }
-
     return this.accountUriExists(accountUri, cardPath)
   }
 

package/lib/rdf-notification-template.js

@@ -0,0 +1,66 @@
+const CONTEXT_ACTIVITYSTREAMS = 'https://www.w3.org/ns/activitystreams'
+const CONTEXT_NOTIFICATION = 'https://www.w3.org/ns/solid/notification/v1'
+const CONTEXT_XML_SCHEMA = 'http://www.w3.org/2001/XMLSchema'
+
+function generateJSONNotification ({
+  activity: type,
+  eventId: id,
+  date: published,
+  object,
+  target,
+  state = undefined
+}) {
+  return {
+    published,
+    type,
+    id,
+    object,
+    ...(type === 'Add') && { target },
+    ...(type === 'Remove') && { origin: target },
+    ...(state) && { state }
+  }
+}
+
+function generateTurtleNotification ({
+  activity,
+  eventId,
+  date,
+  object,
+  target,
+  state = undefined
+}) {
+  const stateLine = `\n    notify:state "${state}" ;`
+
+  return `@prefix as: <${CONTEXT_ACTIVITYSTREAMS}#> .
+@prefix notify: <${CONTEXT_NOTIFICATION}#> .
+@prefix xsd: <${CONTEXT_XML_SCHEMA}#> .
+
+<${eventId}> a as:${activity} ;${state && stateLine}
+    as:object ${object} ;
+    as:published "${date}"^^xsd:dateTime .`.replaceAll('\n', '\r\n')
+}
+
+function serializeToJSONLD (notification, isActivityStreams = false) {
+  notification['@context'] = [CONTEXT_NOTIFICATION]
+  if (!isActivityStreams) {
+    notification['@context'].unshift(CONTEXT_ACTIVITYSTREAMS)
+  }
+  return JSON.stringify(notification, null, 2)
+}
+
+function rdfTemplate (props) {
+  const { mediaType } = props
+  if (mediaType[0] === 'application/activity+json' || (mediaType[0] === 'application/ld+json' && mediaType[1].get('profile')?.toLowerCase() === 'https://www.w3.org/ns/activitystreams')) {
+    return serializeToJSONLD(generateJSONNotification(props), true)
+  }
+
+  if (mediaType[0] === 'application/ld+json') {
+    return serializeToJSONLD(generateJSONNotification(props))
+  }
+
+  if (mediaType[0] === 'text/turtle') {
+    return generateTurtleNotification(props)
+  }
+}
+
+module.exports = rdfTemplate

package/lib/utils.js

@@ -201,7 +201,7 @@ async function getQuota (root, serverUri) {
     return Infinity
   }
   const graph = $rdf.graph()
-  const storageUri = serverUri + '/'
+  const storageUri = serverUri.endsWith('/') ? serverUri : serverUri + '/'
   try {
     $rdf.parse(prefs, graph, storageUri, 'text/turtle')
   } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "5.7.10",
+  "version": "5.8.0",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"
@@ -74,7 +74,10 @@
     "cors": "^2.8.5",
     "debug": "^4.3.4",
     "express": "^4.18.3",
+    "express-accept-events": "^0.3.0",
     "express-handlebars": "^5.3.5",
+    "express-negotiate-events": "^0.3.0",
+    "express-prep": "^0.6.3",
     "express-session": "^1.18.0",
     "extend": "^3.0.2",
     "from2": "^2.3.0",
@@ -89,7 +92,7 @@
     "ip-range-check": "0.2.0",
     "is-ip": "^3.1.0",
     "li": "^1.3.0",
-    "mashlib": "^1.8.10",
+    "mashlib": "^1.8.11",
     "mime-types": "^2.1.35",
     "negotiator": "^0.6.3",
     "node-fetch": "^2.7.0",
@@ -114,7 +117,9 @@
     "vhost": "^3.0.2"
   },
   "devDependencies": {
+    "@cxres/structured-headers": "^2.0.0-alpha.1-nesting.0",
     "@solid/solid-auth-oidc": "0.3.0",
+    "c8": "^10.1.2",
     "chai": "^4.4.1",
     "chai-as-promised": "7.1.1",
     "cross-env": "7.0.3",
@@ -124,8 +129,8 @@
     "mocha": "^10.3.0",
     "nock": "^13.5.4",
     "node-mocks-http": "^1.14.1",
-    "nyc": "15.1.0",
     "pre-commit": "1.2.2",
+    "prep-fetch": "^0.1.0",
     "randombytes": "2.1.0",
     "sinon": "12.0.1",
     "sinon-chai": "3.7.0",
@@ -141,19 +146,26 @@
   "main": "index.js",
   "scripts": {
     "build": "echo nothing to build",
-    "solid": "node ./bin/solid",
-    "standard": "standard '{bin,examples,lib,test}/**/*.js'",
+    "solid": "node --experimental-require-module ./bin/solid",
+    "standard": "standard \"{bin,examples,lib,test}/**/*.js\"",
     "validate": "node ./test/validate-turtle.js",
-    "nyc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nyc --reporter=text-summary mocha --recursive test/integration/ test/unit/",
-    "mocha": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/ test/unit/",
-    "mocha-integration": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/http-test.js",
+    "c8": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 c8 --reporter=text-summary mocha -n experimental-require-module --recursive test/integration/ test/unit/",
+    "mocha": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha -n experimental-require-module --recursive test/integration/ test/unit/",
+    "mocha-integration": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha -n experimental-require-module --recursive test/integration/http-test.js",
+    "mocha-account-creation-oidc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/account-creation-oidc-test.js",
+    "mocha-account-manager": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/account-manager-test.js",
+    "mocha-account-template": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/account-template-test.js",
+    "mocha-acl-oidc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/acl-oidc-test.js",
+    "mocha-authentication-oidc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/authentication-oidc-test.js",
+    "mocha-header": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/header-test.js",
+    "mocha-ldp": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/ldp-test.js",
     "prepublishOnly": "npm test",
     "postpublish": "git push --follow-tags",
-    "test": "npm run standard && npm run validate && npm run nyc",
+    "test": "npm run standard && npm run validate && npm run c8",
     "clean": "rimraf config/templates config/views",
     "reset": "rimraf .db data && npm run clean"
   },
-  "nyc": {
+  "c8": {
     "reporter": [
       "html",
       "text-summary"
@@ -167,13 +179,15 @@
       "before",
       "beforeEach",
       "describe",
-      "it"
+      "it",
+      "fetch",
+      "AbortController"
     ]
   },
   "bin": {
     "solid": "bin/solid"
   },
   "engines": {
-    "node": ">=12.0"
+    "node": ">=20.17.0 <21 || >=22.8.0"
   }
 }