solid-server 5.8.6 → 5.8.7

package/lib/webid/lib/get.js

@@ -1,27 +1,35 @@
 module.exports = get
 
-const request = require('request')
+const fetch = require('node-fetch')
 const url = require('url')
 
 function get (webid, callback) {
-  const uri = url.URL(webid)
-  const options = {
-    url: uri,
-    method: 'GET',
-    headers: {
-      Accept: 'text/turtle, application/ld+json'
-    }
+  let uri
+  try {
+    uri = new url.URL(webid)
+  } catch (err) {
+    return callback(new Error('Invalid WebID URI: ' + webid + ': ' + err.message))
   }
 
-  request(options, function (err, res, body) {
-    if (err) {
-      return callback(new Error('Failed to fetch profile from ' + uri.href + ': ' + err))
-    }
-
-    if (res.statusCode !== 200) {
-      return callback(new Error('Failed to retrieve WebID from ' + uri.href + ': HTTP ' + res.statusCode))
-    }
+  const headers = {
+    Accept: 'text/turtle, application/ld+json'
+  }
 
-    callback(null, body, res.headers['content-type'])
-  })
+  fetch(uri.href, { method: 'GET', headers })
+    .then(async res => {
+      if (!res.ok) {
+        return callback(new Error('Failed to retrieve WebID from ' + uri.href + ': HTTP ' + res.status))
+      }
+      const contentType = res.headers.get('content-type')
+      let body
+      if (contentType && contentType.includes('json')) {
+        body = JSON.stringify(await res.json(), null, 2)
+      } else {
+        body = await res.text()
+      }
+      callback(null, body, contentType)
+    })
+    .catch(err => {
+      return callback(new Error('Failed to fetch profile from ' + uri.href + ': ' + err))
+    })
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "5.8.6",
+  "version": "5.8.7",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"
@@ -60,9 +60,10 @@
   "bugs": "https://github.com/solid/node-solid-server/issues",
   "dependencies": {
     "@fastify/busboy": "^1.2.1",
+    "@fastify/pre-commit": "^2.2.1",
     "@solid/acl-check": "^0.4.5",
-    "@solid/oidc-auth-manager": "^0.24.3",
-    "@solid/oidc-op": "^0.11.6",
+    "@solid/oidc-auth-manager": "^0.24.5",
+    "@solid/oidc-op": "^0.11.7",
     "async-lock": "^1.4.1",
     "body-parser": "^1.20.3",
     "bootstrap": "^3.4.1",
@@ -98,12 +99,12 @@
     "node-fetch": "^2.7.0",
     "node-forge": "^1.3.1",
     "node-mailer": "^0.1.1",
-    "nodemailer": "^6.10.0",
+    "nodemailer": "^7.0.10",
     "nyc": "^15.1.0",
     "oidc-op-express": "^0.0.3",
     "owasp-password-strength-test": "^1.3.0",
+    "rdflib": "^2.3.0",
     "recursive-readdir": "^2.2.3",
-    "request": "^2.88.2",
     "rimraf": "^3.0.2",
     "solid-auth-client": "^2.5.6",
     "solid-namespace": "^0.5.4",
@@ -129,7 +130,6 @@
     "mocha": "^10.8.2",
     "nock": "^13.5.6",
     "node-mocks-http": "^1.16.2",
-    "pre-commit": "1.2.2",
     "prep-fetch": "^0.1.0",
     "randombytes": "2.1.0",
     "sinon": "12.0.1",