wiki-server 0.26.0-rc.8 → 0.26.0

package/lib/page.js

@@ -22,16 +22,38 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { pathToFileURL } from 'node:url'
+import url from 'node:url'
 import events from 'node:events'
 
 import { createRequire } from 'node:module'
 const require = createRequire(import.meta.url)
 
 // Use dynamic import to load package.json from the main application's working directory
-const packageJsonPath = path.join(process.cwd(), 'package.json')
-const packageJsonUrl = pathToFileURL(packageJsonPath).href
-const { default: packageJson } = await import(packageJsonUrl, { with: { type: 'json' } })
+const wikiPackageImport = async () => {
+  let done = false
+  return new Promise(resolve => {
+    import('wiki/package.json', { with: { type: 'json' } })
+      .then(imported => {
+        done = true
+        resolve(imported.default)
+      })
+      .catch(e => {
+        return e
+      })
+      .then(async () => {
+        if (done) return
+        const packageJsonPath = path.join(process.cwd(), 'package.json')
+        const packageJsonUrl = url.pathToFileURL(packageJsonPath).href
+        import(packageJsonUrl, { with: { type: 'json' } })
+          .then(imported => {
+            resolve(imported.default)
+          })
+          .catch(e => console.error('problems importing package', e))
+      })
+  })
+}
+
+const packageJson = await wikiPackageImport()
 
 // import random_id from './random_id.cjs'; // Uncomment if needed
 import synopsis from 'wiki-client/lib/synopsis.js' // Add correct extension if necessary

package/lib/random_id.js

@@ -11,4 +11,3 @@
 // chars that defaults to 16 and returns a random id.
 
 export default (chars = 16) => [...Array(chars)].map(() => Math.floor(Math.random() * 16).toString(16)).join('')
-

package/lib/server.js

@@ -61,15 +61,18 @@ const require = createRequire(import.meta.url)
 // Use import to load package.json from the main application's working directory
 //const { default: packageJson } = await import('wiki/package.json', { with: { type: 'json' } })
 const wikiPackageImport = async () => {
+  let done = false
   return new Promise(resolve => {
     import('wiki/package.json', { with: { type: 'json' } })
       .then(imported => {
+        done = true
         resolve(imported.default)
       })
       .catch(e => {
         return e
       })
       .then(async () => {
+        if (done) return
         const packageJsonPath = path.join(process.cwd(), 'package.json')
         const packageJsonUrl = url.pathToFileURL(packageJsonPath).href
         import(packageJsonUrl, { with: { type: 'json' } })
@@ -132,6 +135,8 @@ export default async argv => {
 
   app.startOpts = argv
 
+  const wikiName = new URL(argv.url).hostname
+
   const log = (...stuff) => {
     if (argv.debug) console.log(stuff)
   }
@@ -252,7 +257,7 @@ export default async argv => {
   // use logger, at least in development, probably needs a param to configure (or turn off).
   // use stream to direct to somewhere other than stdout.
   logger.token('vhost', (req, res) => {
-    return colorString(req.hostname)
+    return colorString(wikiName)
   })
   app.use(logger(':vhost :method :url :status :res[content-length] - :response-time ms'))
   app.use(cookieParser())
@@ -492,7 +497,7 @@ export default async argv => {
       if (!err) {
         res.sendFile(favLoc, { dotfiles: 'allow' })
       } else {
-        res.sendFile(defaultFavLoc)
+        res.sendFile(defaultFavLoc, { dotfiles: 'allow' })
       }
     })
   })
@@ -724,7 +729,7 @@ export default async argv => {
       return new Promise(resolve => {
         try {
           // Use import to load package.json from the main application's working directory
-          import('wiki/package.json', { with: { type: 'json' } }).then(({ default: packageJson }) => {
+          import(`${packageName}/package.json`, { with: { type: 'json' } }).then(({ default: packageJson }) => {
             resolve({ [packageName]: packageJson.version })
           })
         } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0-rc.8",
+  "version": "0.26.0",
   "type": "module",
   "author": {
     "name": "Ward Cunningham",