diff --git a/lib/dev.js b/lib/dev.js
index 92a060e..784f7ea 100644
--- a/lib/dev.js
+++ b/lib/dev.js
@@ -1,4 +1,5 @@
import http from 'http'
+import https from 'https'
import fs from 'iofs'
import { join, resolve, dirname } from 'path'
import { parse } from 'url'
@@ -9,9 +10,14 @@ import MIME_TYPES from './mime-tpyes.js'
import { COMMON_HEADERS } from './constants.js'
const noc = Buffer.from('')
+const SERVER_OPTIONS = {}
export default function createServer(root = '', conf = {}) {
const IS_MPA = Object.keys(conf.pages).length > 1
+ const PORT = conf.devServer.port
+ const USE_HTTPS = conf.devServer.https
+ const DOMAIN = conf.devServer.domain || 'localhost'
+ const WEB_SERVER = USE_HTTPS ? https : http
let indexPage = Object.keys(conf.pages)
.map(it => {
let tmp = it + '.html'
@@ -22,154 +28,159 @@ export default function createServer(root = '', conf = {}) {
let pagesDir = '',
currentPage = ''
- http
- .createServer(function (req, res) {
- let pathname = parse(req.url.slice(1)).pathname
- let pageName = '',
- isIndex = false
- let ext
+ if (USE_HTTPS) {
+ Object.assign(SERVER_OPTIONS, conf.devServer.ssl)
- if (pathname) {
- pathname = pathname.split('/')
+ if (!SERVER_OPTIONS.key || !SERVER_OPTIONS.cert) {
+ console.error('证书错误: https 证书不能为空!!!\n')
+ process.exit(1)
+ }
+ }
- if (pathname[0].endsWith('.html')) {
- pageName = pathname.shift()
+ WEB_SERVER.createServer(SERVER_OPTIONS, function (req, res) {
+ let pathname = parse(req.url.slice(1)).pathname
+ let pageName = '',
+ isIndex = false
+ let ext
- let tmp = pageName.split('.')
+ if (pathname) {
+ pathname = pathname.split('/')
- ext = tmp.pop()
- pageName = tmp.join('.')
+ if (pathname[0].endsWith('.html')) {
+ pageName = pathname.shift()
- currentPage = pageName
- pagesDir = dirname(conf.pages[pageName].entry)
- } else {
- ext = pathname.at(-1).split('.').pop()
- pageName = currentPage
- }
- pathname = pathname.join('/')
+ let tmp = pageName.split('.')
+
+ ext = tmp.pop()
+ pageName = tmp.join('.')
+
+ currentPage = pageName
+ pagesDir = dirname(conf.pages[pageName].entry)
} else {
- isIndex = true
+ ext = pathname.at(-1).split('.').pop()
+ pageName = currentPage
+ }
+ pathname = pathname.join('/')
+ } else {
+ isIndex = true
+ }
+
+ for (let k in COMMON_HEADERS) {
+ res.setHeader(k, COMMON_HEADERS[k])
+ }
+
+ if (isIndex) {
+ res.setHeader('content-type', MIME_TYPES.html)
+ res.writeHead(200, 'OK')
+ res.end('
')
+ } else {
+ res.setHeader('accept-ranges', 'bytes')
+
+ let code = ''
+
+ switch (ext) {
+ case 'html':
+ {
+ res.setHeader('content-type', MIME_TYPES.html)
+
+ let page = conf.pages[pageName]
+ let entry = fs.cat(page.entry).toString()
+ let html = fs.cat(join(process.env.PWD, 'index.html')).toString()
+
+ entry = parseJs(entry, conf.imports, { IS_MPA, currentPage })
+
+ code = parseHtml(html, { page, imports: conf.imports, entry })
+ }
+
+ break
+
+ case 'vue':
+ {
+ let rpath = pathname.replace(/^assets\/js\//, '')
+ let file
+
+ if (IS_MPA) {
+ file = join(pagesDir, rpath)
+ } else {
+ file = join(root, rpath)
+ }
+ if (!fs.isfile(file)) {
+ file = file.replace(/\.vue$/, '/index.vue')
+ }
+
+ // console.log('>>>>', file)
+ code = compileVue(file, conf.imports, { IS_MPA, currentPage, root, pagesDir })
+ res.setHeader('content-type', MIME_TYPES.js)
+ }
+ break
+
+ case 'scss':
+ case 'css':
+ {
+ let file = join(root, pathname.replace(/^assets\/css\//, ''))
+ code = compileScss(file)
+ res.setHeader('content-type', MIME_TYPES.css)
+ }
+ break
+
+ case 'js':
+ {
+ pathname = pathname.replace(/^assets\/js\//, '')
+ let file
+ if (pathname.startsWith(currentPage)) {
+ file = join(pagesDir, pathname)
+ } else {
+ file = join(root, pathname)
+ }
+ if (fs.isfile(file)) {
+ code = fs.cat(file)
+ } else {
+ file = file.replace(/\.js$/, '/index.js')
+ code = fs.cat(file)
+ }
+ code = parseJs(code + '', conf.imports, { IS_MPA, currentPage })
+ res.setHeader('content-type', MIME_TYPES.js)
+ }
+
+ break
+
+ case 'png':
+ case 'jpg':
+ case 'jpeg':
+ case 'webp':
+ case 'gif':
+ case 'svg':
+ case 'ico':
+ case 'bmp':
+ res.setHeader('content-type', MIME_TYPES[ext])
+ code = fs.cat(join(root, pathname))
+ if (code === null) {
+ console.error(pathname, '文件不存在')
+ res.writeHead(404, 'Not Found')
+ res.end('')
+ return
+ }
+ break
+
+ default:
+ res.setHeader('content-type', MIME_TYPES[ext] || MIME_TYPES.html)
+ break
}
- for (let k in COMMON_HEADERS) {
- res.setHeader(k, COMMON_HEADERS[k])
- }
-
- if (isIndex) {
- res.setHeader('content-type', MIME_TYPES.html)
- res.writeHead(200, 'OK')
- res.end('')
- } else {
- res.setHeader('accept-ranges', 'bytes')
-
- let code = ''
-
- // return res.end(JSON.stringify({url: req.url, ext, pageName}))
-
- res.setHeader('x-ext', ext)
- res.setHeader('x-page', pageName)
-
- switch (ext) {
- case 'html':
- {
- res.setHeader('content-type', MIME_TYPES.html)
-
- let page = conf.pages[pageName]
- let entry = fs.cat(page.entry).toString()
- let html = fs.cat(join(process.env.PWD, 'index.html')).toString()
-
- entry = parseJs(entry, conf.imports, { IS_MPA, currentPage })
-
- code = parseHtml(html, { page, imports: conf.imports, entry })
- }
-
- break
-
- case 'vue':
- {
- let rpath = pathname.replace(/^assets\/js\//, '')
- let file
-
- if (IS_MPA) {
- file = join(pagesDir, rpath)
- } else {
- file = join(root, rpath)
- }
- if (!fs.isfile(file)) {
- file = file.replace(/\.vue$/, '/index.vue')
- }
-
- // console.log('>>>>', file)
- code = compileVue(file, conf.imports, { IS_MPA, currentPage, root, pagesDir })
- res.setHeader('content-type', MIME_TYPES.js)
- }
- break
-
- case 'scss':
- case 'css':
- {
- let file = join(root, pathname.replace(/^assets\/css\//, ''))
- code = compileScss(file)
- res.setHeader('content-type', MIME_TYPES.css)
- }
- break
-
- case 'js':
- {
- pathname = pathname.replace(/^assets\/js\//, '')
- let file
- if (pathname.startsWith(currentPage)) {
- file = join(pagesDir, pathname)
- } else {
- file = join(root, pathname)
- }
- if (fs.isfile(file)) {
- code = fs.cat(file)
- } else {
- file = file.replace(/\.js$/, '/index.js')
- code = fs.cat(file)
- }
- code = parseJs(code + '', conf.imports, { IS_MPA, currentPage })
- res.setHeader('content-type', MIME_TYPES.js)
- }
-
- break
-
- case 'png':
- case 'jpg':
- case 'jpeg':
- case 'webp':
- case 'gif':
- case 'svg':
- case 'ico':
- case 'bmp':
- res.setHeader('content-type', MIME_TYPES[ext])
- code = fs.cat(join(root, pathname))
- if (code === null) {
- console.error(pathname, '文件不存在')
- res.writeHead(404, 'Not Found')
- res.end('')
- return
- }
- break
-
- default:
- res.setHeader('content-type', MIME_TYPES[ext] || MIME_TYPES.html)
- break
- }
-
- res.setHeader('content-length', Buffer.byteLength(code || noc))
- res.writeHead(200, 'OK')
- res.end(code || noc)
- }
- })
- .listen(conf.port)
+ res.setHeader('content-length', Buffer.byteLength(code || noc))
+ res.writeHead(200, 'OK')
+ res.end(code || noc)
+ }
+ })
+ .listen(PORT)
.on('error', err => {
- console.log(`${conf.port}端口被占用~~~`)
- conf.port++
- createServer()
+ console.log(`${PORT}端口被占用~~~`)
+ conf.devServer.port++
+ createServer(root, conf)
})
.on('listening', _ => {
- console.log('启动成功, 请访问', 'http://127.0.0.1:' + conf.port)
+ console.log('启动成功, 可通过以下地址访问')
+ console.log(' 本地: %s://%s:%d', USE_HTTPS ? 'https' : 'http', '127.0.0.1', PORT)
+ console.log(' 外网: %s://%s:%d\n', USE_HTTPS ? 'https' : 'http', DOMAIN, PORT)
})
}
diff --git a/package.json b/package.json
index cb91232..dc5f516 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "@bytedo/vue-live",
"type": "module",
- "version": "0.0.6",
+ "version": "0.0.7",
"bin": {
"vue-live": "index.js"
},