@srfnstack/spliffy 1.2.4 → 1.2.6

package/src/server.mjs

@@ -1,141 +1,141 @@
-import log from './log.mjs'
-import { getNodeModuleRoutes } from './nodeModuleHandler.mjs'
-import uws from 'uWebSockets.js'
-import { createHandler, createNotFoundHandler } from './handler.mjs'
-import { findRoutes } from './routes.mjs'
-import path from 'path'
-import fs from 'fs'
-
-const state = {
-  routes: {},
-  initialized: false
-}
-const appMethods = {
-  GET: 'get',
-  POST: 'post',
-  PUT: 'put',
-  PATCH: 'patch',
-  DELETE: 'del',
-  OPTIONS: 'options',
-  HEAD: 'head',
-  CONNECT: 'connect',
-  TRACE: 'trace',
-  WEBSOCKET: 'ws'
-}
-const optionsHandler = (config, middleware, methods) => {
-  return createHandler(() => ( {
-      headers: {
-        allow: methods
-      },
-      statusCode: 204
-    } ),
-    middleware,
-    [],
-    config
-  )
-}
-
-const startHttpRedirect = (host, port) => {
-  // redirect http to https
-  uws.App().any('/*',
-    (req, res) => {
-      try {
-        res.writeHead(301, { Location: `https://${req.headers.get('host')}:${port}${req.url}` })
-        res.end()
-      } catch (e) {
-        log.error(`Failed to handle http request on port ${port}`, req.url, e)
-      }
-    }
-  ).listen(host || '0.0.0.0', port, (token) => {
-    if (token) {
-      log.gne(`Http redirect server initialized at ${new Date().toISOString()} and listening on port ${port}`)
-    } else {
-      throw new Error(`Failed to start server on port ${port}`)
-    }
-  })
-}
-
-const getHttpsApp = (key, cert) => {
-  const keyPath = path.resolve(key)
-  const certPath = path.resolve(cert)
-  if (!fs.existsSync(keyPath)) throw new Error(`Can't find https key file: ${keyPath}`)
-  if (!fs.existsSync(certPath)) throw new Error(`Can't find https cert file: ${keyPath}`)
-  return uws.App({
-    key_file_name: keyPath,
-    cert_file_name: certPath
-  })
-}
-
-export async function startServer (config) {
-  if (!state.initialized) {
-    state.initialized = true
-    const routes = [...getNodeModuleRoutes(config), ...( await findRoutes(config) )]
-    let app, port
-    if (config.httpsKeyFile) {
-      app = getHttpsApp(config.secure)
-      port = config.secure.port || 14420
-      startHttpRedirect(config.host, config.port || 10420)
-    } else {
-      app = uws.App()
-      port = config.port || 10420
-    }
-
-    for (const route of routes) {
-      if (config.printRoutes) {
-        log.info('Configured Route: ', route)
-      }
-      const routePattern = `^${route.urlPath.replace(/:[^/]+/g, '[^/]+').replace(/\*/g, '.*')}$`
-      if (config.notFoundRoute && config.notFoundRoute.match(routePattern)) {
-        config.notFoundRouteHandler = route
-        route.statusCodeOverride = 404
-      }
-      if (config.defaultRoute && config.defaultRoute.match(routePattern)) {
-        config.defaultRouteHandler = route
-      }
-      let hadSlash = false
-      if (route.urlPath.endsWith('/') && route.urlPath.length > 1) {
-        hadSlash = true
-        route.urlPath = route.urlPath.substring(0, route.urlPath.length - 1)
-      }
-      for (const method in route.handlers) {
-        let theHandler = null
-        if (method === 'WEBSOCKET') {
-          theHandler = route.handlers[method]
-        } else {
-          theHandler = createHandler(route.handlers[method], route.middleware, route.pathParameters, config)
-        }
-        app[appMethods[method]](route.urlPath, theHandler)
-        if (hadSlash && config.serveRoutesWithSlash) {
-          app[appMethods[method]](route.urlPath + '/', theHandler)
-        }
-        if (route.urlPath.endsWith('/*')) {
-          app[appMethods[method]](route.urlPath.substr(0, route.urlPath.length - 2), theHandler)
-        }
-      }
-      if (config.autoOptions && !route.handlers.OPTIONS) {
-        const theHandler = optionsHandler(config, route.middleware, Object.keys(route.handlers).join(', '))
-        app.options(route.urlPath, theHandler)
-        if (hadSlash && config.serveRoutesWithSlash) {
-          app.options(route.urlPath + '/', theHandler)
-        }
-      }
-    }
-
-    if (config.notFoundRoute && !config.notFoundRouteHandler) {
-      log.warn('No route matched not found route: ' + config.notFoundRoute)
-    }
-    if (config.defaultRoute && !config.defaultRouteHandler) {
-      log.warn('No route matched default route: ' + config.notFoundRoute)
-    }
-
-    app.any('/*', createNotFoundHandler(config))
-    app.listen(config.host || '::', config.port, (token) => {
-      if (token) {
-        log.gne(`Server initialized at ${new Date().toISOString()} and listening on port ${port}`)
-      } else {
-        throw new Error(`Failed to start server on port ${port}`)
-      }
-    })
-    return app
-  }
-}
+import log from './log.mjs'
+import { getNodeModuleRoutes } from './nodeModuleHandler.mjs'
+import uws from 'uWebSockets.js'
+import { createHandler, createNotFoundHandler } from './handler.mjs'
+import { findRoutes } from './routes.mjs'
+import path from 'path'
+import fs from 'fs'
+
+const state = {
+  routes: {},
+  initialized: false
+}
+const appMethods = {
+  GET: 'get',
+  POST: 'post',
+  PUT: 'put',
+  PATCH: 'patch',
+  DELETE: 'del',
+  OPTIONS: 'options',
+  HEAD: 'head',
+  CONNECT: 'connect',
+  TRACE: 'trace',
+  WEBSOCKET: 'ws'
+}
+const optionsHandler = (config, middleware, methods) => {
+  return createHandler(() => ({
+    headers: {
+      allow: methods
+    },
+    statusCode: 204
+  }),
+  middleware,
+  [],
+  config
+  )
+}
+
+const startHttpRedirect = (host, port) => {
+  // redirect http to https
+  uws.App().any('/*',
+    (req, res) => {
+      try {
+        res.writeHead(301, { Location: `https://${req.headers.get('host')}:${port}${req.url}` })
+        res.end()
+      } catch (e) {
+        log.error(`Failed to handle http request on port ${port}`, req.url, e)
+      }
+    }
+  ).listen(host || '0.0.0.0', port, (token) => {
+    if (token) {
+      log.gne(`Http redirect server initialized at ${new Date().toISOString()} and listening on port ${port}`)
+    } else {
+      throw new Error(`Failed to start server on port ${port}`)
+    }
+  })
+}
+
+const getHttpsApp = (key, cert) => {
+  const keyPath = path.resolve(key)
+  const certPath = path.resolve(cert)
+  if (!fs.existsSync(keyPath)) throw new Error(`Can't find https key file: ${keyPath}`)
+  if (!fs.existsSync(certPath)) throw new Error(`Can't find https cert file: ${keyPath}`)
+  return uws.App({
+    key_file_name: keyPath,
+    cert_file_name: certPath
+  })
+}
+
+export async function startServer (config) {
+  if (!state.initialized) {
+    state.initialized = true
+    const routes = [...getNodeModuleRoutes(config), ...(await findRoutes(config))]
+    let app, port
+    if (config.httpsKeyFile) {
+      app = getHttpsApp(config.secure)
+      port = config.secure.port || 14420
+      startHttpRedirect(config.host, config.port || 10420)
+    } else {
+      app = uws.App()
+      port = config.port || 10420
+    }
+
+    for (const route of routes) {
+      if (config.printRoutes) {
+        log.info('Configured Route: ', route)
+      }
+      const routePattern = `^${route.urlPath.replace(/:[^/]+/g, '[^/]+').replace(/\*/g, '.*')}$`
+      if (config.notFoundRoute && config.notFoundRoute.match(routePattern)) {
+        config.notFoundRouteHandler = route
+        route.statusCodeOverride = 404
+      }
+      if (config.defaultRoute && config.defaultRoute.match(routePattern)) {
+        config.defaultRouteHandler = route
+      }
+      let hadSlash = false
+      if (route.urlPath.endsWith('/') && route.urlPath.length > 1) {
+        hadSlash = true
+        route.urlPath = route.urlPath.substring(0, route.urlPath.length - 1)
+      }
+      for (const method in route.handlers) {
+        let theHandler = null
+        if (method === 'WEBSOCKET') {
+          theHandler = route.handlers[method]
+        } else {
+          theHandler = createHandler(route.handlers[method], route.middleware, route.pathParameters, config)
+        }
+        app[appMethods[method]](route.urlPath, theHandler)
+        if (hadSlash && config.serveRoutesWithSlash) {
+          app[appMethods[method]](route.urlPath + '/', theHandler)
+        }
+        if (route.urlPath.endsWith('/*')) {
+          app[appMethods[method]](route.urlPath.substr(0, route.urlPath.length - 2), theHandler)
+        }
+      }
+      if (config.autoOptions && !route.handlers.OPTIONS) {
+        const theHandler = optionsHandler(config, route.middleware, Object.keys(route.handlers).join(', '))
+        app.options(route.urlPath, theHandler)
+        if (hadSlash && config.serveRoutesWithSlash) {
+          app.options(route.urlPath + '/', theHandler)
+        }
+      }
+    }
+
+    if (config.notFoundRoute && !config.notFoundRouteHandler) {
+      log.warn('No route matched not found route: ' + config.notFoundRoute)
+    }
+    if (config.defaultRoute && !config.defaultRouteHandler) {
+      log.warn('No route matched default route: ' + config.notFoundRoute)
+    }
+
+    app.any('/*', createNotFoundHandler(config))
+    app.listen(config.host || '::', config.port, (token) => {
+      if (token) {
+        log.gne(`Server initialized at ${new Date().toISOString()} and listening on port ${port}`)
+      } else {
+        throw new Error(`Failed to start server on port ${port}`)
+      }
+    })
+    return app
+  }
+}

package/src/serverConfig.mjs

@@ -1,100 +1,100 @@
-import { initContentHandlers } from './content.mjs'
-import { validateMiddleware } from './middleware.mjs'
-import log from './log.mjs'
-
-const defaultHeaders = {
-  acceptsDefault: '*/*',
-  defaultContentType: '*/*'
-}
-// this is mainly for performance reasons
-const nonsense = [
-  'I\'m toasted',
-  'that hurt',
-  'your interwebs!',
-  'I see a light...',
-  'totally zooted',
-  'misplaced my bits',
-  'maybe reboot?',
-  'what was I doing again?',
-  'my cabbages!!!',
-  'Leeerrroooyyy Jeeenkins',
-  'at least I have chicken'
-]
-
-export const randomNonsense = () => `[OH NO, ${nonsense[Math.floor(Math.random() * nonsense.length)]}]`
-
-export async function initConfig (userConfig) {
-  const config = Object.assign({}, userConfig)
-
-  if (!('decodePathParameters' in config)) {
-    config.decodePathParameters = false
-  }
-
-  if (!('decodeQueryParams' in config)) {
-    config.decodeQueryParams = false
-  }
-
-  if (!('extendIncomingMessage' in config)) {
-    config.extendIncomingMessage = false
-  }
-
-  if (!('parseCookie' in config)) {
-    config.parseCookie = false
-  }
-
-  if (!('writeDateHeader' in config)) {
-    config.writeDateHeader = false
-  }
-
-  config.acceptsDefault = config.acceptsDefault || defaultHeaders.acceptsDefault
-  config.defaultContentType = config.defaultContentType || defaultHeaders.defaultContentType
-
-  config.contentHandlers = initContentHandlers(config.contentHandlers || {})
-  config.resolveWithoutExtension = config.resolveWithoutExtension || []
-  if (!Array.isArray(config.resolveWithoutExtension)) {
-    config.resolveWithoutExtension = [config.resolveWithoutExtension]
-  }
-
-  if (config.resolveWithoutExtension.indexOf('.htm') === -1) {
-    config.resolveWithoutExtension.push('.htm')
-  }
-  if (config.resolveWithoutExtension.indexOf('.html') === -1) {
-    config.resolveWithoutExtension.push('.html')
-  }
-
-  if (config.middleware) {
-    validateMiddleware(config.middleware)
-  }
-
-  if (!('logAccess' in config)) {
-    config.logAccess = false
-  }
-  if ('logLevel' in config) {
-    log.setLogLevel(config.logLevel)
-  }
-  if (!('ignoreFilesMatching' in config)) {
-    config.ignoreFilesMatching = []
-  } else if (!Array.isArray(config.ignoreFilesMatching)) {
-    config.ignoreFilesMatching = [config.ignoreFilesMatching]
-  }
-  if (!('allowTestFileRoutes' in config)) {
-    config.allowTestFileRoutes = false
-  }
-  config.port = config.port || 10420
-  if (!config.httpPort) {
-    config.httpPort = config.port - 1
-  }
-
-  if (!('autoOptions' in config)) {
-    config.autoOptions = false
-  }
-
-  if (config.logger) {
-    log.setLogger(config.logger)
-  }
-
-  if ((config.httpsKeyFile && !config.httpsCertFile) || (!config.httpsKeyFile && config.httpsCertFile)) {
-    throw new Error('You must provide both httpsKeyFile and httpsCertFile')
-  }
-  return config
-}
+import { initContentHandlers } from './content.mjs'
+import { validateMiddleware } from './middleware.mjs'
+import log from './log.mjs'
+
+const defaultHeaders = {
+  acceptsDefault: '*/*',
+  defaultContentType: '*/*'
+}
+// this is mainly for performance reasons
+const nonsense = [
+  'I\'m toasted',
+  'that hurt',
+  'your interwebs!',
+  'I see a light...',
+  'totally zooted',
+  'misplaced my bits',
+  'maybe reboot?',
+  'what was I doing again?',
+  'my cabbages!!!',
+  'Leeerrroooyyy Jeeenkins',
+  'at least I have chicken'
+]
+
+export const randomNonsense = () => `[OH NO, ${nonsense[Math.floor(Math.random() * nonsense.length)]}]`
+
+export async function initConfig (userConfig) {
+  const config = Object.assign({}, userConfig)
+
+  if (!('decodePathParameters' in config)) {
+    config.decodePathParameters = false
+  }
+
+  if (!('decodeQueryParams' in config)) {
+    config.decodeQueryParams = false
+  }
+
+  if (!('extendIncomingMessage' in config)) {
+    config.extendIncomingMessage = false
+  }
+
+  if (!('parseCookie' in config)) {
+    config.parseCookie = false
+  }
+
+  if (!('writeDateHeader' in config)) {
+    config.writeDateHeader = false
+  }
+
+  config.acceptsDefault = config.acceptsDefault || defaultHeaders.acceptsDefault
+  config.defaultContentType = config.defaultContentType || defaultHeaders.defaultContentType
+
+  config.contentHandlers = initContentHandlers(config.contentHandlers || {})
+  config.resolveWithoutExtension = config.resolveWithoutExtension || []
+  if (!Array.isArray(config.resolveWithoutExtension)) {
+    config.resolveWithoutExtension = [config.resolveWithoutExtension]
+  }
+
+  if (config.resolveWithoutExtension.indexOf('.htm') === -1) {
+    config.resolveWithoutExtension.push('.htm')
+  }
+  if (config.resolveWithoutExtension.indexOf('.html') === -1) {
+    config.resolveWithoutExtension.push('.html')
+  }
+
+  if (config.middleware) {
+    validateMiddleware(config.middleware)
+  }
+
+  if (!('logAccess' in config)) {
+    config.logAccess = false
+  }
+  if ('logLevel' in config) {
+    log.setLogLevel(config.logLevel)
+  }
+  if (!('ignoreFilesMatching' in config)) {
+    config.ignoreFilesMatching = []
+  } else if (!Array.isArray(config.ignoreFilesMatching)) {
+    config.ignoreFilesMatching = [config.ignoreFilesMatching]
+  }
+  if (!('allowTestFileRoutes' in config)) {
+    config.allowTestFileRoutes = false
+  }
+  config.port = config.port || 10420
+  if (!config.httpPort) {
+    config.httpPort = config.port - 1
+  }
+
+  if (!('autoOptions' in config)) {
+    config.autoOptions = false
+  }
+
+  if (config.logger) {
+    log.setLogger(config.logger)
+  }
+
+  if ((config.httpsKeyFile && !config.httpsCertFile) || (!config.httpsKeyFile && config.httpsCertFile)) {
+    throw new Error('You must provide both httpsKeyFile and httpsCertFile')
+  }
+  return config
+}

package/src/start.mjs

@@ -1,25 +1,25 @@
-import { initConfig, randomNonsense } from './serverConfig.mjs'
-import log from './log.mjs'
-import { startServer } from './server.mjs'
-
-export default async function (config) {
-  if (!config || !config.routeDir) {
-    throw new Error('You must supply a config object with at least a routeDir property. routeDir should be a full path.')
-  }
-  process
-    .on('unhandledRejection', (reason, p) => {
-      log.error(randomNonsense(), reason, 'Unhandled Rejection at Promise', p)
-    })
-    .on('uncaughtException', (err, origin) => {
-      log.error(randomNonsense(), `Caught unhandled exception: ${err}\n` +
-                `Exception origin: ${origin}`)
-    })
-
-  log.gne('Starting Spliffy!')
-  const configWithDefaults = await initConfig(config)
-  return startServer(configWithDefaults).catch(e => {
-    log.error(randomNonsense(), 'Exception during startup:', e)
-    // Spliffy threw an exception, or a route handler failed to load.
-    process.exit(420)
-  })
-}
+import { initConfig, randomNonsense } from './serverConfig.mjs'
+import log from './log.mjs'
+import { startServer } from './server.mjs'
+
+export default async function (config) {
+  if (!config || !config.routeDir) {
+    throw new Error('You must supply a config object with at least a routeDir property. routeDir should be a full path.')
+  }
+  process
+    .on('unhandledRejection', (reason, p) => {
+      log.error(randomNonsense(), reason, 'Unhandled Rejection at Promise', p)
+    })
+    .on('uncaughtException', (err, origin) => {
+      log.error(randomNonsense(), `Caught unhandled exception: ${err}\n` +
+                `Exception origin: ${origin}`)
+    })
+
+  log.gne('Starting Spliffy!')
+  const configWithDefaults = await initConfig(config)
+  return startServer(configWithDefaults).catch(e => {
+    log.error(randomNonsense(), 'Exception during startup:', e)
+    // Spliffy threw an exception, or a route handler failed to load.
+    process.exit(420)
+  })
+}