upgrade to the latest lws

Author: 75lb

bin/cli.js

@@ -4,12 +4,7 @@ const nodeVersionMatches = require('node-version-matches')
 if (nodeVersionMatches('>=8')) {
   const WsCli = require('../lib/cli-app')
   const cli = new WsCli()
-  try {
-    cli.start()
-  } catch (err) {
-    console.error(require('util').inspect(err, { depth: 6, colors: true }))
-    process.exitCode = 1
-  }
+  cli.start()
 } else {
   console.log('Sorry, this app requires node v8.0.0 or above. Please upgrade https://nodejs.org/en/')
 }

index.js

@@ -1,5 +1,4 @@
 const Lws = require('lws')
-const path = require('path')
 
 /**
  * @module local-web-server
@@ -39,27 +38,24 @@ class LocalWebServer extends Lws {
    * @param [options.ciphers] {string} - Optional cipher suite specification, replacing the default.
    * @param [options.secureProtocol] {string} - Optional SSL method to use, default is "SSLv23_method".
    * @param [options.stack] {string[]|Middlewares[]} - Array of feature classes, or filenames of modules exporting a feature class.
-   * @param [options.server] {string|ServerFactory} - Custom server factory, e.g. lws-http2.
-   * @param [options.websocket] {string|Websocket} - Path to a websocket module
    * @param [options.moduleDir] {string[]} - One or more directories to search for modules.
    * @returns {Server}
    */
-  listen (options) {
-    options = Object.assign({
-      moduleDir: path.resolve(__dirname, `./node_modules`),
-      modulePrefix: 'lws-',
-      stack: require('./lib/default-stack')
-    }, options)
-    return super.listen(options)
 
-    /**
-     * Highly-verbose debug information event stream.
-     *
-     * @event module:local-web-server#verbose
-     * @param key {string} - An identifying string, e.g. `server.socket.data`.
-     * @param value {*} - The value, e.g. `{ socketId: 1, bytesRead: '3 Kb' }`.
-     */
+  getDefaultConfig () {
+    return Object.assign(super.getDefaultConfig(), {
+      moduleDir: [ __dirname, '.' ],
+      stack: require('./lib/default-stack')
+    })
   }
 }
 
+/**
+ * Highly-verbose debug information event stream.
+ *
+ * @event module:local-web-server#verbose
+ * @param key {string} - An identifying string, e.g. `server.socket.data`.
+ * @param value {*} - The value, e.g. `{ socketId: 1, bytesRead: '3 Kb' }`.
+ */
+
 module.exports = LocalWebServer

lib/cli-app.js

@@ -2,22 +2,22 @@ const LwsCli = require('lws/lib/cli-app')
 const path = require('path')
 
 class WsCli extends LwsCli {
-  execute (options, argv) {
-    const commandLineArgs = require('command-line-args')
-    const cliOptions = commandLineArgs(this.partialDefinitions(), { camelCase: true, partial: true })
-    if (cliOptions.defaultStack) {
+  execute (options) {
+    if (options.defaultStack) {
       const list = require('./default-stack')
       this.log(list)
     } else {
-      options = {
-        stack: require('./default-stack').slice(),
-        moduleDir: path.resolve(__dirname, `../node_modules`),
-        modulePrefix: 'lws-'
-      }
-      return super.execute(options, argv)
+      return super.execute(options)
     }
   }
 
+  getDefaultOptions () {
+    return Object.assign(super.getDefaultOptions(), {
+      stack: require('./default-stack').slice(),
+      moduleDir: [ path.resolve(__dirname, '..'), '.' ]
+    })
+  }
+
   partialDefinitions () {
     return super.partialDefinitions().concat([
       {

lib/default-stack.js

@@ -2,16 +2,16 @@ module.exports = [
   'lws-basic-auth',
   'lws-body-parser',
   'lws-request-monitor',
-  'lws-log',
-  'lws-cors',
-  'lws-json',
+  // 'lws-log',
+  // 'lws-cors',
+  // 'lws-json',
   'lws-compress',
-  'lws-rewrite',
+  // 'lws-rewrite',
   'lws-blacklist',
-  'lws-conditional-get',
-  'lws-mime',
-  'lws-range',
-  'lws-spa',
+  // 'lws-conditional-get',
+  // 'lws-mime',
+  // 'lws-range',
+  // 'lws-spa',
   'lws-static',
   'lws-index'
 ]

package-lock.json

@@ -2,6 +2,8 @@
   "name": "local-web-server",
   "version": "3.0.0-1",
   "description": "The modular web server for productive full-stack development",
+  "repository": "https://github.com/lwsjs/local-web-server",
+  "author": "Lloyd Brookes <75pound@gmail.com>",
   "bin": {
     "ws": "./bin/cli.js"
   },
@@ -28,30 +30,28 @@
     "docs": "jsdoc2md -p list index.js lib/*.js > doc/api.md; echo",
     "cover": "nyc npm test && nyc report --reporter=text-lcov | coveralls"
   },
-  "repository": "https://github.com/lwsjs/local-web-server",
-  "author": "Lloyd Brookes <75pound@gmail.com>",
   "files": [
-    "bin",
-    "lib",
+    "bin/*.js",
+    "lib/*.js",
     "index.js"
   ],
   "dependencies": {
-    "lws": "2.0.0-3",
-    "lws-basic-auth": "^0.1.1",
-    "lws-blacklist": "^1.0.0",
-    "lws-body-parser": "^0.2.4",
-    "lws-compress": "^0.2.1",
+    "lws": "2.0.0-6",
+    "lws-basic-auth": "^1.0.1",
+    "lws-blacklist": "^2.0.0",
+    "lws-body-parser": "^1.0.0",
+    "lws-compress": "^1.0.0",
     "lws-conditional-get": "^0.3.4",
     "lws-cors": "^1.0.0",
-    "lws-index": "^0.4.0",
+    "lws-index": "^1.0.0",
     "lws-json": "^0.3.2",
     "lws-log": "^0.3.2",
     "lws-mime": "^0.2.2",
     "lws-range": "^1.1.1",
-    "lws-request-monitor": "^0.1.5",
+    "lws-request-monitor": "^1.0.0",
     "lws-rewrite": "^1.0.1",
     "lws-spa": "^1.0.1",
-    "lws-static": "^0.5.0",
+    "lws-static": "^1.0.0",
     "node-version-matches": "^1.0.1"
   },
   "devDependencies": {

package.json

@@ -12,7 +12,7 @@ tom.test('cli.run', async function () {
   const cli = new WsCli({ logError: function () {} })
   const server = cli.start()
   process.argv = origArgv
-  const response = await fetch(`http://127.0.0.1:${port}/`)
+  const response = await fetch(`http://127.0.0.1:${port}/package.json`)
   server.close()
   a.strictEqual(response.status, 200)
 })
@@ -53,6 +53,6 @@ tom.test('cli.run: default-stack', async function () {
   let logMsg = ''
   const cli = new WsCli({ log: function (msg) { logMsg = msg } })
   cli.start()
-  a.ok(/lws-rewrite/.test(logMsg))
+  a.ok(/lws-static/.test(logMsg))
   process.argv = origArgv
 })

test/cli.js

@@ -7,13 +7,12 @@ const tom = module.exports = new Tom('test')
 
 tom.test('basic', async function () {
   const port = 9000 + this.index
-  const localWebServer = new LocalWebServer()
-  const server = localWebServer.listen({
+  const ws = LocalWebServer.create({
     port: port,
     directory: 'test/fixture'
   })
   const response = await fetch(`http://localhost:${port}/one.txt`)
-  server.close()
+  ws.server.close()
   const body = await response.text()
   a.strictEqual(body, 'one\n')
 })