mashlib was not loading and server OIDC listening issue

Author: bourgeoa

lib/api/authn/webid-oidc.mjs

@@ -31,9 +31,9 @@ export function initialize (app, argv) {
   const oidc = fromServerConfig(argv)
   app.locals.oidc = oidc
 
-  // Initialize OIDC provider (async)
-  // Store the promise so the server can await it before listening
-  app.locals.initPromise = oidc.initialize()
+  // Store initialization function to be called after server starts listening
+  // (OIDC client registration needs the server to be up to fetch openid-configuration)
+  app.locals.initFunction = () => oidc.initialize()
 
   // Attach the OIDC API
   app.use('/', middleware(oidc))

lib/create-app.mjs

@@ -1,5 +1,3 @@
-// import { createRequire } from 'module'
-// const require = createRequire(import.meta.url)
 import express from 'express'
 import session from 'express-session'
 import handlebars from 'express-handlebars'
@@ -89,7 +87,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(fileURLToPath(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')))
@@ -331,13 +329,14 @@ function isLogoutRequest (req) {
  *
  * @param app {Object} Express.js app instance
  * @param argv {Object} Config options hashmap
+ * @return {Promise} Resolves when authentication initialization is complete
  */
-function initAuthentication (app, argv) {
+async function initAuthentication (app, argv) {
   const auth = argv.forceUser ? 'forceUser' : argv.auth
   if (!(auth in API.authn)) {
     throw new Error(`Unsupported authentication scheme: ${auth}`)
   }
-  API.authn[auth].initialize(app, argv)
+  await API.authn[auth].initialize(app, argv)
 }
 
 /**

lib/create-server.mjs

@@ -100,19 +100,23 @@ function createServer (argv, app) {
     ldpApp.locals.ldp.live = solidWs.publish.bind(solidWs)
   }
 
-  // Wrap server.listen() to ensure async initialization completes first
+  // Wrap server.listen() to ensure async initialization completes after server starts
   const originalListen = server.listen.bind(server)
   server.listen = function (...args) {
-    if (ldpApp.locals.initPromise) {
-      const initPromise = ldpApp.locals.initPromise
-      delete ldpApp.locals.initPromise
-
-      // Wait for initialization, then start listening
-      initPromise
-        .then(() => originalListen(...args))
-        .catch(err => server.emit('error', err))
-    } else {
-      originalListen(...args)
+    // Start listening first
+    originalListen(...args)
+
+    // Then run async initialization (if needed)
+    if (ldpApp.locals.initFunction) {
+      const initFunction = ldpApp.locals.initFunction
+      delete ldpApp.locals.initFunction
+
+      // Run initialization after server is listening
+      initFunction()
+        .catch(err => {
+          console.error('Initialization error:', err)
+          server.emit('error', err)
+        })
     }
 
     return server

lib/utils.mjs

@@ -5,7 +5,7 @@ import path from 'path'
 import util from 'util'
 import $rdf from 'rdflib'
 import from from 'from2'
-import url from 'url'
+import url, { fileURLToPath } from 'url'
 import debugModule from './debug.mjs'
 import getSize from 'get-folder-size'
 import vocab from 'solid-namespace'
@@ -237,7 +237,7 @@ export function stripLineEndings (obj) {
  */
 export function routeResolvedFile (router, path, file, appendFileName = true) {
   const fullPath = appendFileName ? path + file.match(/[^/]+$/) : path
-  const fullFile = import.meta.resolve(file)
+  const fullFile = fileURLToPath(import.meta.resolve(file))
   router.get(fullPath, (req, res) => res.sendFile(fullFile))
 }