@srfnstack/spliffy 1.2.4 → 1.2.6

package/src/log.mjs

@@ -1,59 +1,59 @@
-import util from 'util'
-
-const inspect = util.inspect
-const levelOrder = { TRACE: 10, DEBUG: 20, INFO: 30, ACCESS: 30, 'GOOD NEWS EVERYONE!': 30, WARN: 40, ERROR: 50, FATAL: 60, NONE: 100 }
-let logLevel = levelOrder.INFO
-
-const ifLevelEnabled = (fn, level, args) => {
-  const configLevel = levelOrder[logLevel] || levelOrder.INFO
-  if (levelOrder[level] >= configLevel) {
-    fn(`[${new Date().toISOString()}] [${level}]  ${args.map(a => typeof a === 'string' ? a : inspect(a, { depth: null })).join(' ')}`)
-  }
-}
-
-const callLog = (level, logImplFn, defaultFn, args) => {
-  if (logImpl && typeof logImpl[logImplFn] === 'function') {
-    logImpl[logImplFn](...args)
-  } else {
-    ifLevelEnabled(defaultFn, level, args)
-  }
-}
-
-let logImpl = null
-
-export default {
-  setLogLevel (level) {
-    level = level.toUpperCase()
-    if (!(level in levelOrder)) {
-      throw new Error(`Invalid level: ${level}`)
-    }
-    logLevel = level
-  },
-  setLogger (logger) {
-    logImpl = logger
-  },
-  trace () {
-    callLog('TRACE', 'trace', console.trace, [...arguments])
-  },
-  debug () {
-    callLog('DEBUG', 'debug', console.debug, [...arguments])
-  },
-  info () {
-    callLog('INFO', 'info', console.info, [...arguments])
-  },
-  gne () {
-    callLog('GOOD NEWS EVERYONE!', 'info', console.info, [...arguments])
-  },
-  access () {
-    callLog('ACCESS', 'info', console.info, [...arguments])
-  },
-  warn () {
-    callLog('WARN', 'warn', console.warn, [...arguments])
-  },
-  error () {
-    callLog('ERROR', 'error', console.error, [...arguments].map(arg => arg.stack ? arg.stack : arg))
-  },
-  fatal () {
-    callLog('ERROR', 'error', console.error, [...arguments].map(arg => arg.stack ? arg.stack : arg))
-  }
-}
+import util from 'util'
+
+const inspect = util.inspect
+const levelOrder = { TRACE: 10, DEBUG: 20, INFO: 30, ACCESS: 30, 'GOOD NEWS EVERYONE!': 30, WARN: 40, ERROR: 50, FATAL: 60, NONE: 100 }
+let logLevel = levelOrder.INFO
+
+const ifLevelEnabled = (fn, level, args) => {
+  const configLevel = levelOrder[logLevel] || levelOrder.INFO
+  if (levelOrder[level] >= configLevel) {
+    fn(`[${new Date().toISOString()}] [${level}]  ${args.map(a => typeof a === 'string' ? a : inspect(a, { depth: null })).join(' ')}`)
+  }
+}
+
+const callLog = (level, logImplFn, defaultFn, args) => {
+  if (logImpl && typeof logImpl[logImplFn] === 'function') {
+    logImpl[logImplFn](...args)
+  } else {
+    ifLevelEnabled(defaultFn, level, args)
+  }
+}
+
+let logImpl = null
+
+export default {
+  setLogLevel (level) {
+    level = level.toUpperCase()
+    if (!(level in levelOrder)) {
+      throw new Error(`Invalid level: ${level}`)
+    }
+    logLevel = level
+  },
+  setLogger (logger) {
+    logImpl = logger
+  },
+  trace () {
+    callLog('TRACE', 'trace', console.trace, [...arguments])
+  },
+  debug () {
+    callLog('DEBUG', 'debug', console.debug, [...arguments])
+  },
+  info () {
+    callLog('INFO', 'info', console.info, [...arguments])
+  },
+  gne () {
+    callLog('GOOD NEWS EVERYONE!', 'info', console.info, [...arguments])
+  },
+  access () {
+    callLog('ACCESS', 'info', console.info, [...arguments])
+  },
+  warn () {
+    callLog('WARN', 'warn', console.warn, [...arguments])
+  },
+  error () {
+    callLog('ERROR', 'error', console.error, [...arguments].map(arg => arg.stack ? arg.stack : arg))
+  },
+  fatal () {
+    callLog('ERROR', 'error', console.error, [...arguments].map(arg => arg.stack ? arg.stack : arg))
+  }
+}

package/src/middleware.mjs

@@ -1,89 +1,89 @@
-import log from './log.mjs'
-/**
- * middleware is stored as an object where the properties are request methods the middleware applies to
- * if a middleware applies to all methods, the property ALL is used
- * example:
- * {
- *     GET: [(req,res,next)=>console.log('ice cream man')]
- *     POST: [(req,res,next)=>console.log('gelato')]
- *     ALL: [(req,res,next)=>console.log('bruce banner')]
- * }
- */
-export const mergeMiddleware = (incoming, existing) => {
-  const mergeInto = cloneMiddleware(existing)
-
-  validateMiddleware(incoming)
-  if (Array.isArray(incoming)) {
-    mergeInto.ALL = (existing.ALL || []).concat(incoming)
-  } else if (typeof incoming === 'object') {
-    for (const method in incoming) {
-      const upMethod = method.toUpperCase()
-      mergeInto[upMethod] = (mergeInto[method] || []).concat(incoming[upMethod] || [])
-    }
-  }
-  return mergeInto
-}
-
-export const cloneMiddleware = (middleware) => {
-  const clone = { ...middleware }
-  for (const method in middleware) {
-    clone[method] = [...(middleware[method] || [])]
-  }
-  return clone
-}
-
-/**
- * Ensure the given middleware is valid
- * @param middleware
- */
-export const validateMiddleware = (middleware) => {
-  if (!Array.isArray(middleware) && typeof middleware === 'object') {
-    for (const method in middleware) {
-      // ensure methods are always available as uppercase
-      const upMethod = method.toUpperCase()
-      middleware[upMethod] = middleware[method]
-      validateMiddlewareArray(middleware[upMethod])
-    }
-  } else {
-    validateMiddlewareArray(middleware)
-  }
-}
-
-export const validateMiddlewareArray = (arr) => {
-  if (!arr) return
-  if (!Array.isArray(arr)) {
-    throw new Error('middleware must be an array of functions')
-  }
-  for (const f of arr) {
-    if (typeof f !== 'function') {
-      throw new Error('Each element in the array of middleware must be a function')
-    }
-  }
-}
-
-export async function invokeMiddleware (middleware, req, res, reqErr) {
-  await new Promise((resolve, reject) => {
-    let current = -1
-    const next = (err) => {
-      if (err) reject(err)
-      if (res.writableEnded) {
-        resolve()
-        return
-      }
-      current++
-      if (current === middleware.length) {
-        resolve()
-      } else {
-        try {
-          if (reqErr) middleware[current](reqErr, req, res, next)
-          else middleware[current](req, res, next)
-        } catch (e) {
-          log.error('Middleware threw exception', e)
-          reject(e)
-        }
-      }
-    }
-
-    next()
-  })
-}
+import log from './log.mjs'
+/**
+ * middleware is stored as an object where the properties are request methods the middleware applies to
+ * if a middleware applies to all methods, the property ALL is used
+ * example:
+ * {
+ *     GET: [(req,res,next)=>console.log('ice cream man')]
+ *     POST: [(req,res,next)=>console.log('gelato')]
+ *     ALL: [(req,res,next)=>console.log('bruce banner')]
+ * }
+ */
+export const mergeMiddleware = (incoming, existing) => {
+  const mergeInto = cloneMiddleware(existing)
+
+  validateMiddleware(incoming)
+  if (Array.isArray(incoming)) {
+    mergeInto.ALL = (existing.ALL || []).concat(incoming)
+  } else if (typeof incoming === 'object') {
+    for (const method in incoming) {
+      const upMethod = method.toUpperCase()
+      mergeInto[upMethod] = (mergeInto[method] || []).concat(incoming[upMethod] || [])
+    }
+  }
+  return mergeInto
+}
+
+export const cloneMiddleware = (middleware) => {
+  const clone = { ...middleware }
+  for (const method in middleware) {
+    clone[method] = [...(middleware[method] || [])]
+  }
+  return clone
+}
+
+/**
+ * Ensure the given middleware is valid
+ * @param middleware
+ */
+export const validateMiddleware = (middleware) => {
+  if (!Array.isArray(middleware) && typeof middleware === 'object') {
+    for (const method in middleware) {
+      // ensure methods are always available as uppercase
+      const upMethod = method.toUpperCase()
+      middleware[upMethod] = middleware[method]
+      validateMiddlewareArray(middleware[upMethod])
+    }
+  } else {
+    validateMiddlewareArray(middleware)
+  }
+}
+
+export const validateMiddlewareArray = (arr) => {
+  if (!arr) return
+  if (!Array.isArray(arr)) {
+    throw new Error('middleware must be an array of functions')
+  }
+  for (const f of arr) {
+    if (typeof f !== 'function') {
+      throw new Error('Each element in the array of middleware must be a function')
+    }
+  }
+}
+
+export async function invokeMiddleware (middleware, req, res, reqErr) {
+  await new Promise((resolve, reject) => {
+    let current = -1
+    const next = (err) => {
+      if (err) reject(err)
+      if (res.writableEnded) {
+        resolve()
+        return
+      }
+      current++
+      if (current === middleware.length) {
+        resolve()
+      } else {
+        try {
+          if (reqErr) middleware[current](reqErr, req, res, next)
+          else middleware[current](req, res, next)
+        } catch (e) {
+          log.error('Middleware threw exception', e)
+          reject(e)
+        }
+      }
+    }
+
+    next()
+  })
+}

package/src/nodeModuleHandler.mjs

@@ -1,75 +1,75 @@
-import fs from 'fs'
-import path from 'path'
-import { mergeMiddleware } from './middleware.mjs'
-import { createStaticHandler } from './staticHandler.mjs'
-import { getContentTypeByExtension } from './content.mjs'
-
-const stripLeadingSlash = p => p.startsWith('/') ? p.substr(1) : p
-
-/**
- This helper will add all the configured node_module files to the given routes.
- The configured node moduleRoutes must be explicit files, no pattern matching is supported.
- Generating the list of files using pattern matching yourself is highly discouraged.
- It is much safer to explicitly list every file you wish to be served so you don't inadvertently serve additional files.
-
- The default method is to read and serve directly from the node_modules directory without copying.
- if method is set to "copy", files are copied from node_modules to their final location within the routes dir folder.
-
- The primary benefit of using this in copy mode is that the files will be automatically updated when the package version
- is updated, and it improves IDE integration by making the file really available after first run.
-
- This could be destructive if not configured correctly, hence the default of read only
- */
-export function getNodeModuleRoutes (config) {
-  const nodeModuleRoutes = config.nodeModuleRoutes
-  const routes = []
-  if (nodeModuleRoutes && typeof nodeModuleRoutes === 'object') {
-    const nodeModulesDir = nodeModuleRoutes.nodeModulesPath ? path.resolve(nodeModuleRoutes.nodeModulesPath) : path.resolve(config.routeDir, '..', 'node_modules')
-    if (!fs.existsSync(nodeModulesDir)) {
-      throw new Error(`Unable to find node_modules dir at ${nodeModulesDir}`)
-    }
-    const prefix = stripLeadingSlash(nodeModuleRoutes.routePrefix || 'lib/ext')
-    if (!Array.isArray(nodeModuleRoutes.files)) {
-      nodeModuleRoutes.files = [nodeModuleRoutes.files]
-    }
-    for (const file of nodeModuleRoutes.files) {
-      let filePath, urlPath
-      if (file && typeof file === 'object') {
-        filePath = path.join(nodeModulesDir, file.modulePath)
-        urlPath = `/${prefix}/${stripLeadingSlash(file.urlPath || file.modulePath)}`
-      } else if (file && typeof file === 'string') {
-        filePath = path.join(nodeModulesDir, file)
-        urlPath = `/${prefix}/${stripLeadingSlash(file)}`
-      } else {
-        throw new Error('Invalid node_module file: ' + file)
-      }
-
-      if (fs.existsSync(filePath)) {
-        if (nodeModuleRoutes.method === 'copy') {
-          const dest = path.join(config.routeDir, urlPath)
-          fs.mkdirSync(path.dirname(dest), { recursive: true })
-          fs.copyFileSync(filePath, dest)
-        } else {
-          const parts = urlPath.split('/')
-          const lastPart = parts.pop()
-          const mw = {}
-          mergeMiddleware(config.middleware, mw)
-          mergeMiddleware(nodeModuleRoutes.middleware || {}, mw)
-          routes.push({
-            pathParameters: [],
-            urlPath,
-            filePath,
-            handlers: createStaticHandler(
-              filePath, getContentTypeByExtension(lastPart, config.staticContentTypes),
-              config.cacheStatic, config.staticCacheControl
-            ),
-            middleware: mw
-          })
-        }
-      } else {
-        console.warn(`The specified node_modules file: ${file} does not exist and will not be served.`)
-      }
-    }
-  }
-  return routes
-}
+import fs from 'fs'
+import path from 'path'
+import { mergeMiddleware } from './middleware.mjs'
+import { createStaticHandler } from './staticHandler.mjs'
+import { getContentTypeByExtension } from './content.mjs'
+
+const stripLeadingSlash = p => p.startsWith('/') ? p.substr(1) : p
+
+/**
+ This helper will add all the configured node_module files to the given routes.
+ The configured node moduleRoutes must be explicit files, no pattern matching is supported.
+ Generating the list of files using pattern matching yourself is highly discouraged.
+ It is much safer to explicitly list every file you wish to be served so you don't inadvertently serve additional files.
+
+ The default method is to read and serve directly from the node_modules directory without copying.
+ if method is set to "copy", files are copied from node_modules to their final location within the routes dir folder.
+
+ The primary benefit of using this in copy mode is that the files will be automatically updated when the package version
+ is updated, and it improves IDE integration by making the file really available after first run.
+
+ This could be destructive if not configured correctly, hence the default of read only
+ */
+export function getNodeModuleRoutes (config) {
+  const nodeModuleRoutes = config.nodeModuleRoutes
+  const routes = []
+  if (nodeModuleRoutes && typeof nodeModuleRoutes === 'object') {
+    const nodeModulesDir = nodeModuleRoutes.nodeModulesPath ? path.resolve(nodeModuleRoutes.nodeModulesPath) : path.resolve(config.routeDir, '..', 'node_modules')
+    if (!fs.existsSync(nodeModulesDir)) {
+      throw new Error(`Unable to find node_modules dir at ${nodeModulesDir}`)
+    }
+    const prefix = stripLeadingSlash(nodeModuleRoutes.routePrefix || 'lib/ext')
+    if (!Array.isArray(nodeModuleRoutes.files)) {
+      nodeModuleRoutes.files = [nodeModuleRoutes.files]
+    }
+    for (const file of nodeModuleRoutes.files) {
+      let filePath, urlPath
+      if (file && typeof file === 'object') {
+        filePath = path.join(nodeModulesDir, file.modulePath)
+        urlPath = `/${prefix}/${stripLeadingSlash(file.urlPath || file.modulePath)}`
+      } else if (file && typeof file === 'string') {
+        filePath = path.join(nodeModulesDir, file)
+        urlPath = `/${prefix}/${stripLeadingSlash(file)}`
+      } else {
+        throw new Error('Invalid node_module file: ' + file)
+      }
+
+      if (fs.existsSync(filePath)) {
+        if (nodeModuleRoutes.method === 'copy') {
+          const dest = path.join(config.routeDir, urlPath)
+          fs.mkdirSync(path.dirname(dest), { recursive: true })
+          fs.copyFileSync(filePath, dest)
+        } else {
+          const parts = urlPath.split('/')
+          const lastPart = parts.pop()
+          const mw = {}
+          mergeMiddleware(config.middleware, mw)
+          mergeMiddleware(nodeModuleRoutes.middleware || {}, mw)
+          routes.push({
+            pathParameters: [],
+            urlPath,
+            filePath,
+            handlers: createStaticHandler(
+              filePath, getContentTypeByExtension(lastPart, config.staticContentTypes),
+              config.cacheStatic, config.staticCacheControl
+            ),
+            middleware: mw
+          })
+        }
+      } else {
+        console.warn(`The specified node_modules file: ${file} does not exist and will not be served.`)
+      }
+    }
+  }
+  return routes
+}