update require() and debug's

Author: bourgeoa

lib/create-app.mjs

@@ -32,7 +32,7 @@ import errorPages from './handlers/error-pages.mjs'
 import * as config from './server-config.mjs'
 import defaults from '../config/defaults.mjs'
 import options from './handlers/options.mjs'
-import { handlers as debug } from './debug.mjs'
+import debug from './debug.mjs'
 import { routeResolvedFile } from './utils.mjs'
 import ResourceMapper from './resource-mapper.mjs'
 

lib/handlers/allow.mjs

@@ -1,5 +1,5 @@
 import ACL from '../acl-checker.mjs'
-// import { handlers as debug} from '../debug.mjs'
+// import debug from '../debug.mjs'
 
 export default function allow (mode) {
   return async function allowHandler (req, res, next) {
@@ -73,7 +73,7 @@ export default function allow (mode) {
       if (resourceUrl.endsWith('.acl') && (await ldp.isOwner(userId, req.hostname))) return next()
     } catch (err) {}
     const error = req.authError || await req.acl.getError(userId, mode)
-    // debug(`ALLOW -- ${mode} access denied to ${userId || '(none)'}: ${error.status} - ${error.message}`)
+    // debug.handlers(`ALLOW -- ${mode} access denied to ${userId || '(none)'}: ${error.status} - ${error.message}`)
     next(error)
   }
-}
+}

lib/handlers/copy.mjs

@@ -1,6 +1,6 @@
 /* eslint-disable node/no-deprecated-api */
 
-import { handlers as debug } from '../debug.mjs'
+import debug from '../debug.mjs'
 import HTTPError from '../http-error.mjs'
 import ldpCopy from '../ldp-copy.mjs'
 import { parse } from 'url'
@@ -28,10 +28,10 @@ export default async function handler (req, res, next) {
   } catch (err) {
     const statusCode = err.statusCode || 500
     const errorMessage = err.statusMessage || err.message
-    debug('Error with COPY request:' + errorMessage)
+    debug.handlers('Error with COPY request:' + errorMessage)
     return next(HTTPError(statusCode, errorMessage))
   }
   res.set('Location', copyToUrl)
   res.sendStatus(201)
   next()
-}
+}

lib/handlers/error-pages.mjs

@@ -1,8 +1,11 @@
 import { server as debug } from '../debug.mjs'
 import fs from 'fs'
+import { createRequire } from 'module'
 import * as util from '../utils.mjs'
 import Auth from '../api/authn/index.mjs'
 
+const require = createRequire(import.meta.url)
+
 function statusCodeFor (err, req, authMethod) {
   let statusCode = err.status || err.statusCode || 500
 
@@ -55,7 +58,7 @@ export function sendErrorPage (statusCode, res, err, ldp) {
 function renderDataBrowser (req, res) {
   res.set('Content-Type', 'text/html')
   const ldp = req.app.locals.ldp
-  const defaultDataBrowser = import.meta.resolve('mashlib/dist/databrowser.html')
+  const defaultDataBrowser = require.resolve('mashlib/dist/databrowser.html')
   const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
   debug('   sending data browser file: ' + dataBrowserPath)
   const dataBrowserHtml = fs.readFileSync(dataBrowserPath, 'utf8')

lib/handlers/get.mjs

@@ -251,4 +251,4 @@ function hasReadPermissions (file, req, res, callback) {
   // "Unexpected literal in error position of callback" in `npm run standard`?
   // eslint-disable-next-line
   allow('Read')(req, res, err => callback(!err))
-}
+}

lib/handlers/patch.js

@@ -49,6 +49,7 @@ async function patchHandler (req, res, next) {
       // First check if the file already exists
       ({ path, contentType } = await ldp.resourceMapper.mapUrlToFile({ url: req }))
     } catch (err) {
+      // debug('PATCH -- File does not exist, creating new resource. Error:', err.message)
       // If the file doesn't exist, request to create one with the file media type as contentType
       ({ path, contentType } = await ldp.resourceMapper.mapUrlToFile(
         { url: req, createIfNotExists: true, contentType: contentTypeForNew(req) }))