update to esm only

Author: CI Fix

bin/lib/updateIndex.mjs

@@ -12,7 +12,7 @@ import { initConfigDir, initTemplateDirs } from '../../lib/server-config.mjs';
 
 export default function (program) {
   program
-    .command('updateindex')
+    .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);

index.mjs

@@ -1,5 +1,5 @@
-import ldnode from './lib/create-app.mjs'
 import createServer from './lib/create-server.mjs'
+import ldnode from './lib/create-app.mjs'
 import startCli from './bin/lib/cli.mjs'
 
 // Preserve the CommonJS-style shape where the default export has

lib/create-app.mjs

@@ -1,12 +1,14 @@
+// import { createRequire } from 'module'
+// const require = createRequire(import.meta.url)
 import express from 'express'
 import session from 'express-session'
 import handlebars from 'express-handlebars'
 import { v4 as uuid } from 'uuid'
 import cors from 'cors'
 import vhost from 'vhost'
-import aclCheck from '@solid/acl-check'
 import path from 'path'
-import { createRequire } from 'module'
+import aclCheck from '@solid/acl-check'
+import fs from 'fs'
 import { fileURLToPath } from 'url'
 import { dirname } from 'path'
 import acceptEventsModule from 'express-accept-events'
@@ -18,29 +20,28 @@ import prepModule from 'express-prep'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 
-// Create require for accessing CommonJS modules and package.json
-const require = createRequire(import.meta.url)
-const { version } = require('../package.json')
+// Read package.json synchronously to avoid using require() for JSON
+const { version } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'))
 
 // Complex internal modules - keep as CommonJS for now except where ESM available
-const LDP = require('./ldp.js')
+import LDP from './ldp.mjs'
 import LdpMiddleware from './ldp-middleware.mjs'
-const corsProxy = require('./handlers/cors-proxy.js')
-const authProxy = require('./handlers/auth-proxy.js')
-const SolidHost = require('./models/solid-host.js')
-const AccountManager = require('./models/account-manager.js')
-const EmailService = require('./services/email-service.js')
-const TokenService = require('./services/token-service.js')
-const capabilityDiscovery = require('./capability-discovery.js')
-const paymentPointerDiscovery = require('./payment-pointer-discovery.js')
-const API = require('./api/index.js')
-const errorPages = require('./handlers/error-pages.js')
-const config = require('./server-config.js')
+import corsProxy from './handlers/cors-proxy.mjs'
+import authProxy from './handlers/auth-proxy.mjs'
+import SolidHost from'./models/solid-host.mjs'
+import AccountManager from './models/account-manager.mjs'
+import EmailService from './services/email-service.mjs'
+import TokenService from './services/token-service.mjs'
+import capabilityDiscovery from './capability-discovery.mjs'
+import paymentPointerDiscovery from './payment-pointer-discovery.mjs'
+import * as API from './api/index.mjs'
+import errorPages from './handlers/error-pages.mjs'
+import * as config from './server-config.mjs'
 import defaults from '../config/defaults.mjs'
-const options = require('./handlers/options.js')
+import options from './handlers/options.mjs'
 import { handlers as debug } from './debug.mjs'
 import { routeResolvedFile } from './utils.mjs'
-const ResourceMapper = require('./resource-mapper.js')
+import ResourceMapper from './resource-mapper.mjs'
 
 // Extract default exports from ESM modules
 const acceptEvents = acceptEventsModule.default
@@ -94,7 +95,7 @@ function createApp (argv = {}) {
 
   // Serve the public 'common' directory (for shared CSS files, etc)
   app.use('/common', express.static(path.join(__dirname, '../common')))
-  app.use('/', express.static(path.dirname(require.resolve('mashlib/dist/databrowser.html')), { index: false }))
+  app.use('/', express.static(path.dirname(import.meta.resolve('mashlib/dist/databrowser.html')), { index: false }))
   routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js')
   routeResolvedFile(app, '/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map')
   app.use('/.well-known', express.static(path.join(__dirname, '../common/well-known')))

lib/create-server.mjs

@@ -3,12 +3,12 @@ import fs from 'fs'
 import https from 'https'
 import http from 'http'
 import SolidWs from 'solid-ws'
-import createApp from './create-app.mjs'
 import globalTunnel from 'global-tunnel-ng'
-import { settings as debugSettings } from './debug.mjs'
-import { createRequire } from 'module'
+import debug from './debug.mjs'
+import createApp from './create-app.mjs'
 
 function createServer (argv, app) {
+  console.log('Creating server with options:', argv)
   argv = argv || {}
   app = app || express()
   const ldpApp = createApp(argv)
@@ -20,8 +20,7 @@ function createServer (argv, app) {
     mount = mount.slice(0, -1)
   }
   app.use(mount, ldpApp)
-  debugSettings('Base URL (--mount): ' + mount)
-
+  debug.settings('Base URL (--mount): ' + mount)
   if (argv.idp) {
     console.warn('The idp configuration option has been renamed to multiuser.')
     argv.multiuser = argv.idp
@@ -37,8 +36,8 @@ function createServer (argv, app) {
   if (!needsTLS) {
     server = http.createServer(app)
   } else {
-    debugSettings('SSL Private Key path: ' + argv.sslKey)
-    debugSettings('SSL Certificate path: ' + argv.sslCert)
+    debug.settings('SSL Private Key path: ' + argv.sslKey)
+    debug.settings('SSL Certificate path: ' + argv.sslCert)
 
     if (!argv.sslCert && !argv.sslKey) {
       throw new Error('Missing SSL cert and SSL key to enable WebIDs')

lib/handlers/allow.js

@@ -1,10 +1,8 @@
 // TODO: This is a CommonJS wrapper. Use allow.mjs directly once ESM migration is complete.
 module.exports = allow
 
-// const path = require('path')
 const ACL = require('../acl-checker')
-// const debug = require('../debug.js').ACL
-// const error = require('../http-error')
+// const debug = require('../debug.js').server
 
 function allow (mode) {
   return async function allowHandler (req, res, next) {
@@ -78,7 +76,6 @@ 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(`${mode} access denied to ${userId || '(none)'}: ${error.status} - ${error.message}`)
     next(error)
   }
 }

lib/handlers/allow.mjs

@@ -1,4 +1,5 @@
 import ACL from '../acl-checker.mjs'
+// import { handlers as debug} from '../debug.mjs'
 
 export default function allow (mode) {
   return async function allowHandler (req, res, next) {
@@ -15,7 +16,7 @@ export default function allow (mode) {
     let resourcePath = res && res.locals && res.locals.path
       ? res.locals.path
       : req.path
-
+    
     // Check whether the resource exists
     let stat
     try {
@@ -72,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(`${mode} access denied to ${userId || '(none)'}: ${error.status} - ${error.message}`)
+    // debug(`ALLOW -- ${mode} access denied to ${userId || '(none)'}: ${error.status} - ${error.message}`)
     next(error)
   }
 }