Rebased from latest

Author: SamAxe

index.js

@@ -2,7 +2,8 @@
 // Simple file so that if you require this directory
 // in node it instead requires ./lib/server.coffee
 // with coffee-script already loaded.
-require('coffeescript')
-require('coffeescript/register')
+import('coffeescript')
+import('coffeescript/register.js')
 
-module.exports = require('./lib/server')
+import * as server from './lib/server.cjs'
+export default server

lib/defaultargs.js

@@ -9,13 +9,19 @@
 // **defaultargs.coffee** when called on the argv object this
 // module will create reasonable defaults for options not supplied,
 // based on what information is provided.
-const path = require('node:path')
+import path from 'node:path'
+import { randomBytes } from 'node:crypto'
+import { fileURLToPath } from 'node:url'
+import { dirname } from 'node:path'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
 const getUserHome = () => {
   return process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE
 }
 
-module.exports = argv => {
+const exports = argv => {
   argv = argv || {}
   argv.root ||= __dirname
   // the directory that contains all the packages that makeup the wiki
@@ -32,7 +38,7 @@ module.exports = argv => {
   argv.url ||= `http://localhost${argv.port === 80 ? '' : ':' + argv.port}`
   argv.id ||= path.join(argv.status, 'owner.json')
   argv.uploadLimit ||= '5mb'
-  argv.cookieSecret ||= require('crypto').randomBytes(64).toString('hex')
+  argv.cookieSecret ||= randomBytes(64).toString('hex')
   argv.secure_cookie ||= false
   argv.session_duration ||= 7
   argv.neighbors ||= ''
@@ -43,18 +49,18 @@ module.exports = argv => {
     argv.database = JSON.parse(argv.database)
   }
   argv.database ||= {}
-  argv.database.type ||= './page'
+  argv.database.type ||= './page.js'
   if (argv.database.type.charAt(0) === '.') {
-    if (argv.database.type != './page') {
+    if (argv.database.type != './page.js') {
       console.log('\n\nWARNING: This storage option is depeciated.')
       console.log('    See ReadMe for details of the changes required.\n\n')
     }
   } else {
     argv.database.type = 'wiki-storage-' + argv.database.type
   }
 
-  argv.security_type ||= './security'
-  if (argv.security_type === './security') {
+  argv.security_type ||= './security.js'
+  if (argv.security_type === './security.js') {
     console.log('\n\nINFORMATION: Using default security module.')
   } else {
     argv.security_type = 'wiki-security-' + argv.security_type
@@ -81,3 +87,6 @@ module.exports = argv => {
   }
   return argv
 }
+
+export default exports
+export { exports }

lib/forward.js

@@ -1,4 +1,4 @@
-const init = (app, emitter) => {
+export const init = (app, emitter) => {
   let sockets = []
   app.io.on('connection', socket => {
     let listeners = []
@@ -35,4 +35,3 @@ const init = (app, emitter) => {
     })
   })
 }
-module.exports = { init }

lib/page.js

@@ -10,15 +10,25 @@
 // Everything is stored using json flat files.
 
 // #### Requires ####
-const fs = require('fs')
-const path = require('path')
-const events = require('events')
-const glob = require('glob')
-
-const async = require('async')
-
-const random_id = require('./random_id')
-const synopsis = require('wiki-client/lib/synopsis')
+// const fs = require('fs')
+// const path = require('path')
+// const events = require('events')
+// const glob = require('glob')
+//
+// const async = require('async')
+//
+// // const random_id = require('./random_id.cjs')
+// const synopsis = require('wiki-client/lib/synopsis')
+
+import fs from 'node:fs'
+import path from 'node:path'
+import events from 'node:events'
+import glob from 'glob'
+
+import async from 'async'
+
+// import random_id from './random_id.cjs'; // Uncomment if needed
+import synopsis from 'wiki-client/lib/synopsis.js' // Add correct extension if necessary
 
 const asSlug = name =>
   name
@@ -28,7 +38,7 @@ const asSlug = name =>
 
 // Export a function that generates a page handler
 // when called with options object.
-module.exports = exports = argv => {
+const exports = argv => {
   const wikiName = new URL(argv.url).hostname
 
   fs.mkdir(argv.db, { recursive: true }, e => {
@@ -446,3 +456,6 @@ module.exports = exports = argv => {
 
   return itself
 }
+
+export default exports
+export { exports }

lib/plugins.js

@@ -8,12 +8,12 @@
 
 // support server-side plugins
 
-const fs = require('node:fs')
-const glob = require('glob')
-const { pathToFileURL } = require('node:url')
-// forward = require './forward'
+import fs from 'node:fs'
+import glob from 'glob'
+import { pathToFileURL } from 'node:url'
+// import forward from './forward.cjs'; // Uncomment if needed and adjust import style if it's not a default export
 
-module.exports = exports = argv => {
+const exports = argv => {
   // NOTE: plugins are now in their own package directories alongside this one...
   // Plugins are in directories of the form wiki-package-*
   // those with a server component will have a server directory
@@ -52,3 +52,6 @@ module.exports = exports = argv => {
 
   return { startServers }
 }
+
+export default exports
+export { exports }

lib/random_id.js

@@ -12,4 +12,5 @@
 
 const random_id = (chars = 16) => [...Array(chars)].map(() => Math.floor(Math.random() * 16).toString(16)).join('')
 
-module.exports = random_id.random_id = random_id
+export default random_id
+export { random_id }

lib/search.js

@@ -8,15 +8,15 @@
 
 // **search.js**
 
-const fs = require('node:fs')
-const path = require('node:path')
-const events = require('node:events')
-const url = require('node:url')
-const writeFileAtomic = require('write-file-atomic')
+import fs from 'node:fs'
+import path from 'node:path'
+import events from 'node:events'
+import url from 'node:url'
+import writeFileAtomic from 'write-file-atomic'
 
-const miniSearch = require('minisearch')
+import MiniSearch from 'minisearch'
 
-module.exports = exports = argv => {
+const exports = argv => {
   const wikiName = new URL(argv.url).hostname
   let siteIndex = []
   const queue = []
@@ -388,3 +388,6 @@ module.exports = exports = argv => {
 
   return itself
 }
+
+export default exports
+export { exports }

lib/security.js

@@ -13,11 +13,11 @@
 // allow the server to run read-only.
 
 // #### Requires ####
-const fs = require('node:fs')
+import fs from 'node:fs'
 
 // Export a function that generates security handler
 // when called with options object.
-module.exports = exports = (log, loga, argv) => {
+const exports = (log, loga, argv) => {
   const security = {}
 
   // #### Private utility methods. ####
@@ -92,3 +92,6 @@ module.exports = exports = (log, loga, argv) => {
 
   return security
 }
+
+export default exports
+export { exports }

lib/server.js lib/server.cjslib/server.js renamed to lib/server.cjs

@@ -51,12 +51,12 @@ const bodyParser = require('body-parser')
 const errorHandler = require('errorhandler')
 
 // Local files
-const random = require('./random_id')
-const defargs = require('./defaultargs')
+// const random = require('./random_id.cjs')
+const defargs = require('./defaultargs.js')
 const resolveClient = require('wiki-client/lib/resolve')
-const pluginsFactory = require('./plugins')
-const sitemapFactory = require('./sitemap')
-const searchFactory = require('./search')
+const pluginsFactory = require('./plugins.js')
+const sitemapFactory = require('./sitemap.js')
+const searchFactory = require('./search.js')
 
 const render = page => {
   return (
@@ -103,7 +103,7 @@ module.exports = exports = argv => {
   // defaultargs.coffee exports a function that takes the argv object
   // that is passed in and then does its
   // best to supply sane defaults for any arguments that are missing.
-  argv = defargs(argv)
+  argv = defargs.default(argv)
 
   app.startOpts = argv
 
@@ -130,16 +130,16 @@ module.exports = exports = argv => {
   }
   let pagehandler, sitemaphandler, searchhandler, securityhandler
   // Require the database adapter and initialize it with options.
-  app.pagehandler = pagehandler = require(argv.database.type)(argv)
+  app.pagehandler = pagehandler = require(argv.database.type).default(argv)
 
   // Require the sitemap adapter and initialize it with options.
-  app.sitemaphandler = sitemaphandler = sitemapFactory(argv)
+  app.sitemaphandler = sitemaphandler = sitemapFactory.default(argv)
 
   // Require the site indexer and initialize it with options
-  app.searchhandler = searchhandler = searchFactory(argv)
+  app.searchhandler = searchhandler = searchFactory.default(argv)
 
   // Require the security adapter and initialize it with options.
-  app.securityhandler = securityhandler = require(argv.security_type)(log, loga, argv)
+  app.securityhandler = securityhandler = require(argv.security_type).default(log, loga, argv)
 
   // If the site is owned, owner will contain the name of the owner
   let owner = ''
@@ -928,7 +928,7 @@ module.exports = exports = argv => {
   app.on('running-serv', server => {
     // ### Plugins ###
     // Should replace most WebSocketServers below.
-    const plugins = pluginsFactory(argv)
+    const plugins = pluginsFactory.default(argv)
     plugins.startServers({ argv, app })
     // ### Sitemap ###
     // create sitemap at start-up

lib/sitemap.js

@@ -7,22 +7,21 @@
  */
 
 // **sitemap.coffee**
+import fs from 'node:fs'
+import path from 'node:path'
+import events from 'node:events'
+import writeFileAtomic from 'write-file-atomic'
+import xml2js from 'xml2js'
 
-const fs = require('fs')
-const path = require('path')
-const events = require('events')
-const writeFileAtomic = require('write-file-atomic')
-const xml2js = require('xml2js')
-
-const synopsis = require('wiki-client/lib/synopsis')
+import synopsis from 'wiki-client/lib/synopsis.js' // Add .js if needed
 
 const asSlug = name =>
   name
     .replace(/\s/g, '-')
     .replace(/[^A-Za-z0-9-]/g, '')
     .toLowerCase()
 
-module.exports = exports = argv => {
+const exports = argv => {
   const wikiName = new URL(argv.url).hostname
 
   let sitemap = []
@@ -286,3 +285,6 @@ module.exports = exports = argv => {
 
   return itself
 }
+
+export default exports
+export { exports }