@srfnstack/spliffy 0.9.4 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srfnstack/spliffy",
-  "version": "0.9.4",
+  "version": "1.0.1",
   "author": "snowbldr",
   "private": false,
   "homepage": "https://github.com/narcolepticsnowman/spliffy",
@@ -32,7 +32,7 @@
   "dependencies": {
     "cookie": "^0.4.1",
     "etag": "^1.8.1",
-    "uWebSockets.js": "uNetworking/uWebSockets.js#v20.4.0",
+    "uWebSockets.js": "uNetworking/uWebSockets.js#v20.10.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

package/src/nodeModuleHandler.mjs

@@ -7,10 +7,18 @@ import { getContentTypeByExtension } from './content.mjs'
 const stripLeadingSlash = p => p.startsWith('/') ? p.substr(1) : p
 
 /**
- This method will add all of the configured node_module files to the given routes.
+ 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
@@ -20,7 +28,7 @@ export function getNodeModuleRoutes (config) {
     if (!fs.existsSync(nodeModulesDir)) {
       throw new Error(`Unable to find node_modules dir at ${nodeModulesDir}`)
     }
-    const prefix = stripLeadingSlash(nodeModuleRoutes.routePrefix || 'lib')
+    const prefix = stripLeadingSlash(nodeModuleRoutes.routePrefix || 'lib/ext')
     if (!Array.isArray(nodeModuleRoutes.files)) {
       nodeModuleRoutes.files = [nodeModuleRoutes.files]
     }
@@ -37,21 +45,27 @@ export function getNodeModuleRoutes (config) {
       }
 
       if (fs.existsSync(filePath)) {
-        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
-        })
+        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.`)
       }

package/src/server.mjs

@@ -68,7 +68,7 @@ const getHttpsApp = (key, cert) => {
 export async function startServer (config) {
   if (!state.initialized) {
     state.initialized = true
-    const routes = [...(await findRoutes(config)), ...getNodeModuleRoutes(config)]
+    const routes = [...getNodeModuleRoutes(config), ...(await findRoutes(config))]
     let app, port
     if (config.httpsKeyFile) {
       app = getHttpsApp(config.secure)
@@ -101,7 +101,7 @@ export async function startServer (config) {
           app[appMethods[method]](route.urlPath.substr(0, route.urlPath.length - 2), theHandler)
         }
       }
-      if (!route.handlers.OPTIONS) {
+      if (config.autoOptions && !route.handlers.OPTIONS) {
         app.options(route.urlPath, optionsHandler(config, route.middleware, Object.keys(route.handlers).join(', ')))
       }
     }

package/src/serverConfig.mjs

@@ -85,6 +85,10 @@ export async function initConfig (userConfig) {
     config.httpPort = config.port - 1
   }
 
+  if (!('autoOptions' in config)) {
+    config.autoOptions = false
+  }
+
   if (config.logger) {
     log.setLogger(config.logger)
   }