replace node-fetch with node:fetch and update for isIp and some lints

Author: bourgeoa

lib/acl-checker.mjs

@@ -1,5 +1,5 @@
 'use strict'
-/* eslint-disable node/no-deprecated-api */
+/* eslint-disable n/no-deprecated-api */
 
 import { dirname } from 'path'
 import rdf from 'rdflib'
@@ -10,7 +10,6 @@ import aclCheck from '@solid/acl-check'
 import Url, { URL } from 'url'
 import { promisify } from 'util'
 import fs from 'fs'
-import httpFetch from 'node-fetch'
 
 export const DEFAULT_ACL_SUFFIX = '.acl'
 const ACL = rdf.Namespace('http://www.w3.org/ns/auth/acl#')
@@ -309,7 +308,7 @@ function fetchLocalOrRemote (mapper, serverUri) {
       body = await promisify(fs.readFile)(path, { encoding: 'utf8' })
     } else {
       // Fetch the acl from the internet
-      const response = await httpFetch(url)
+      const response = await fetch(url)
       body = await response.text()
       contentType = response.headers.get('content-type')
     }

lib/create-server.mjs

@@ -65,8 +65,8 @@ function createServer (argv, app) {
     }
 
     const credentials = Object.assign({
-      key: key,
-      cert: cert
+      key,
+      cert
     }, argv)
 
     if (ldp.webid && ldp.auth === 'tls') {

lib/handlers/copy.mjs

@@ -1,4 +1,4 @@
-/* eslint-disable node/no-deprecated-api */
+/* eslint-disable n/no-deprecated-api */
 
 import debug from '../debug.mjs'
 import HTTPError from '../http-error.mjs'

lib/handlers/cors-proxy.mjs

@@ -1,11 +1,11 @@
-/* eslint-disable node/no-deprecated-api */
+/* eslint-disable n/no-deprecated-api */
 
 import { createProxyMiddleware } from 'http-proxy-middleware'
 import cors from 'cors'
 import debug from '../debug.mjs'
 import url from 'url'
 import dns from 'dns'
-import isIp from 'is-ip'
+import { isIP } from 'is-ip'
 import ipRange from 'ip-range-check'
 import validUrl from 'valid-url'
 
@@ -75,7 +75,7 @@ function extractProxyConfig (req, res, next) {
 
   // Parse the URL and retrieve its host's IP address
   const { protocol, host, hostname, path } = url.parse(uri)
-  if (isIp(hostname)) {
+  if (isIP(hostname)) {
     addProxyConfig(null, hostname)
   } else {
     dns.lookup(hostname, addProxyConfig)

lib/handlers/get.mjs

@@ -48,9 +48,9 @@ export default async function handler (req, res, next) {
 
   const options = {
     hostname: req.hostname,
-    path: path,
-    includeBody: includeBody,
-    possibleRDFType: possibleRDFType,
+    path,
+    includeBody,
+    possibleRDFType,
     range: req.headers.range,
     contentType: req.headers.accept
   }

lib/handlers/index.mjs

@@ -1,4 +1,4 @@
-/* eslint-disable node/no-deprecated-api */
+/* eslint-disable n/no-deprecated-api */
 
 import path from 'path'
 import debugModule from 'debug'

lib/handlers/options.mjs

@@ -1,4 +1,4 @@
-/* eslint-disable node/no-deprecated-api */
+/* eslint-disable n/no-deprecated-api */
 
 import { addLink } from '../header.mjs'
 import url from 'url'

lib/ldp.mjs

@@ -1,4 +1,4 @@
-/* eslint-disable node/no-deprecated-api */
+/* eslint-disable n/no-deprecated-api */
 
 import utilPath, { join, dirname } from 'path'
 import intoStream from 'into-stream'
@@ -14,7 +14,6 @@ import extend from 'extend'
 import rimraf from 'rimraf'
 import { exec } from 'child_process'
 import * as ldpContainer from './ldp-container.mjs'
-import fetch from 'node-fetch'
 import { promisify } from 'util'
 import withLock from './lock.mjs'
 import { clearAclCache } from './acl-checker.mjs'

lib/models/account-manager.mjs

@@ -258,7 +258,7 @@ class AccountManager {
         const emailData = {
           to: userAccount.email,
           webId: userAccount.webId,
-          deleteUrl: deleteUrl
+          deleteUrl
         }
         return this.emailService.sendWithTemplate('delete-account.mjs', emailData)
       })

lib/resource-mapper.mjs

@@ -1,4 +1,4 @@
-/* eslint-disable node/no-deprecated-api, no-mixed-operators */
+/* eslint-disable n/no-deprecated-api, no-mixed-operators */
 
 import fs from 'fs'
 import URL from 'url'