Revert "updates .mjs"

This reverts commit b370ff7.

Author: CI Fix

bin/lib/start.mjs

@@ -3,8 +3,6 @@ import fs from 'fs';
 import path from 'path';
 import { loadConfig } from './cli-utils.mjs';
 import { red, bold } from 'colorette';
-import ldnode from '../../index.mjs';
-
 
 export default function (program, server) {
   const start = program
@@ -98,8 +96,7 @@ async function bin(argv, server) {
      n0:mode           n0:Read.`;
     fs.writeFileSync(rootPath, defaultAcl);
   }
-  // const solid = (await import('../../index.js')).default;
-  const solid = ldnode;
+  const solid = (await import('../../index.js')).default;
   let app;
   try {
     app = solid.createServer(argv, server);

lib/create-app.mjs

@@ -7,7 +7,6 @@ import vhost from 'vhost'
 import aclCheck from '@solid/acl-check'
 import path from 'path'
 import { createRequire } from 'module'
-import fs from 'fs'
 import { fileURLToPath } from 'url'
 import { dirname } from 'path'
 import acceptEventsModule from 'express-accept-events'
@@ -19,44 +18,36 @@ import prepModule from 'express-prep'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 
-// Read package.json synchronously to avoid using require() for JSON
-const { version } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'))
+// Create require for accessing CommonJS modules and package.json
+const require = createRequire(import.meta.url)
+const { version } = require('../package.json')
 
 // Complex internal modules - keep as CommonJS for now except where ESM available
-import LDP from './ldp.mjs'
+const LDP = require('./ldp.js')
 import LdpMiddleware from './ldp-middleware.mjs'
-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'
+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 defaults from '../config/defaults.mjs'
-import options from './handlers/options.mjs'
+const options = require('./handlers/options.js')
 import { handlers as debug } from './debug.mjs'
 import { routeResolvedFile } from './utils.mjs'
-import ResourceMapper from './resource-mapper.mjs'
+const ResourceMapper = require('./resource-mapper.js')
 
 // Extract default exports from ESM modules
 const acceptEvents = acceptEventsModule.default
 const events = negotiateEventsModule.default
 const eventID = eventIDModule.default
 const prep = prepModule.default
 
-// Defensive fallbacks: if any of these weren't provided as functions (for example
-// when the optional packages are missing or export differently), replace them
-// with no-op middleware so `app.use(...)` doesn't receive `undefined`.
-function noopMiddleware (req, res, next) { return next() }
-const safeEventID = typeof eventID === 'function' ? eventID : noopMiddleware
-const safeAcceptEvents = typeof acceptEvents === 'function' ? acceptEvents : noopMiddleware
-const safeEvents = typeof events === 'function' ? events : noopMiddleware
-const safePrep = typeof prep === 'function' ? prep : noopMiddleware
-
 const corsSettings = cors({
   methods: [
     'OPTIONS', 'HEAD', 'GET', 'PATCH', 'POST', 'PUT', 'DELETE'
@@ -90,97 +81,10 @@ function createApp (argv = {}) {
 
   const app = express()
 
-  // Temporary instrumentation: wrap `app.route` and `app.use` to detect
-  // registrations of undefined handlers which cause "Route.get() requires a
-  // callback function but got a [object Undefined]" errors during tests.
-  // This will log the path, method and the offending handler for diagnosis
-  // and can be removed once the problematic registration is fixed.
-  ;(function instrumentApp () {
-    try {
-      const origRoute = app.route.bind(app)
-      app.route = function (path) {
-        const route = origRoute(path)
-        const methods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options']
-        methods.forEach(m => {
-          const orig = route[m].bind(route)
-          route[m] = function (...handlers) {
-            handlers.forEach((h, i) => {
-              if (typeof h !== 'function') {
-                console.error('\n[diagnostic] Non-function handler detected for route', m.toUpperCase(), path)
-                console.error('[diagnostic] handler index:', i, 'value:', h)
-                console.error(new Error().stack)
-              }
-            })
-            return orig(...handlers)
-          }
-        })
-        return route
-      }
-
-      const origUse = app.use.bind(app)
-      app.use = function (...args) {
-        // app.use can be called as app.use(fn) or app.use(path, fn)
-        const handlers = args.filter(a => typeof a === 'function' || Array.isArray(a)).slice(-1)
-        handlers.forEach((h, idx) => {
-          if (Array.isArray(h)) {
-            h.forEach((hh, ii) => {
-              if (typeof hh !== 'function') {
-                console.error('\n[diagnostic] Non-function middleware detected in app.use array at index', ii, 'value:', hh)
-                console.error(new Error().stack)
-              }
-            })
-          } else if (typeof h !== 'function') {
-            console.error('\n[diagnostic] Non-function middleware detected in app.use args at index', idx, 'value:', h)
-            console.error(new Error().stack)
-          }
-        })
-        return origUse(...args)
-      }
-    } catch (e) {
-      console.error('[diagnostic] failed to instrument app.route/app.use', e)
-    }
-  })()
-
-  // Also instrument Express Router methods (get/post/use/put/patch/delete/options/head)
-  ;(function instrumentRouter () {
-    try {
-      const proto = express.Router && express.Router.prototype
-      if (!proto) { return }
-      const methods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options', 'use']
-      methods.forEach(m => {
-        if (!proto[m]) { return }
-        const orig = proto[m]
-        proto[m] = function (...args) {
-          // handlers can be provided as (path, fn...), or (fn...)
-          const handlers = args.slice(typeof args[0] === 'string' || args[0] instanceof RegExp ? 1 : 0)
-          handlers.forEach((h, i) => {
-            if (Array.isArray(h)) {
-              h.forEach((hh, ii) => {
-                if (typeof hh !== 'function') {
-                  console.error('\n[diagnostic] Non-function handler detected for router.%s at path %s', m, args[0])
-                  console.error('[diagnostic] handler index:', i, 'array index:', ii, 'value:', hh)
-                  console.error(new Error().stack)
-                }
-              })
-            } else if (typeof h !== 'function') {
-              console.error('\n[diagnostic] Non-function handler detected for router.%s at path %s', m, args[0])
-              console.error('[diagnostic] handler index:', i, 'value:', h)
-              console.error(new Error().stack)
-            }
-          })
-          return orig.apply(this, args)
-        }
-      })
-    } catch (e) {
-      console.error('[diagnostic] failed to instrument express.Router methods', e)
-    }
-  })()
-
   // Add PREP support
   if (argv.prep) {
-    // Use the safe fallbacks to avoid passing `undefined` to app.use()
-    app.use(safeEventID)
-    app.use(safeAcceptEvents, safeEvents, safePrep)
+    app.use(eventID)
+    app.use(acceptEvents, events, prep)
   }
 
   initAppLocals(app, argv, ldp)
@@ -190,7 +94,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(import.meta.resolve('mashlib/dist/databrowser.html')), { index: false }))
+  app.use('/', express.static(path.dirname(require.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')))
@@ -237,26 +141,6 @@ function createApp (argv = {}) {
   }
 
   // Attach the LDP middleware
-  // Server-side diagnostic middleware: logs incoming requests and when responses finish.
-  // Helps detect requests that never complete (hang) during tests.
-  app.use((req, res, next) => {
-    try {
-      const cookie = req.get('Cookie') || req.get('cookie') || ''
-      console.error('[srv-debug] incoming request:', req.method, req.path, 'cookie-present:', !!cookie)
-    } catch (e) {
-      console.error('[srv-debug] incoming request: error reading headers', e)
-    }
-    const start = Date.now()
-    res.on('finish', () => {
-      try {
-        console.error('[srv-debug] request finished:', req.method, req.path, 'status:', res.statusCode, 'durationMs:', Date.now() - start)
-      } catch (e) {
-        console.error('[srv-debug] request finished: error logging', e)
-      }
-    })
-    next()
-  })
-
   app.use('/', LdpMiddleware(corsSettings, argv.prep))
 
   // https://stackoverflow.com/questions/51741383/nodejs-express-return-405-for-un-supported-method