From dc7081a6c9504771929ea123e84602d3933d78e4 Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sat, 4 Jun 2022 09:01:15 +0800 Subject: [PATCH] rename to base-envar-config --- package.json | 2 +- server.js | 157 ++++++++++++++++++++++++--------------------------- 2 files changed, 74 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index e4cb2f9..a841abd 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "method-override": "^2.3.10", "morgan": "^1.9.0", "serve-favicon": "^2.5.0", - "base.enviconfig": "git+https://git.faronear.org/npm/base.enviconfig", + "base-envar-config": "git+https://git.faronear.org/npm/base-envar-config", "vhost": "^3.0.2" }, "devDependencies": { diff --git a/server.js b/server.js index 3d7bd37..20fd66a 100644 --- a/server.js +++ b/server.js @@ -2,49 +2,51 @@ const fs = require('fs') const path = require('path') const express = require('express') -const wo = (global.wo = { - envar : require('base.enviconfig').mergeEnvar({rawEnvar: { - Commander_Option_List: [ - // 命令行里可以接受的参数。将传给 config.js 里的 commander。每个参数的定义格式是 [参数名，参数键，描述]，后两者用于传给commander，取值后覆盖掉Config里的同名变量。 - ['Web_Protocol', '-P, --Web_Protocol ', 'Web protocol: http|https|httpall.'], - ['Web_Hostname', '-H, --Web_Hostname ', 'Host IP or domain name.'], - ['Web_Port', '-p, --Web_Port ', 'HTTP port number.'], - ['Web_Root', '-w, --Web_Root ', 'Path to serve as website.'], - ['Web_Ssl', '--Web_Ssl ', 'SSL options in JSON string.'], - ], - // 最基础的必须的默认配置，如果用户什么也没有提供 - Web_Protocol: 'http', - Web_Hostname: 'localhost', - Web_Root: '_webroot', // local path to serve as webroot - Web_Index: 'index.html', - // 如果使用虚拟主机 - /* +const wo = (global.wo = { + envar: require('base-envar-config').merge_envar({ + rawEnvar: { + Commander_Option_List: [ + // 命令行里可以接受的参数。将传给 config.js 里的 commander。每个参数的定义格式是 [参数名，参数键，描述]，后两者用于传给commander，取值后覆盖掉Config里的同名变量。 + ['Web_Protocol', '-P, --Web_Protocol ', 'Web protocol: http|https|httpall.'], + ['Web_Hostname', '-H, --Web_Hostname ', 'Host IP or domain name.'], + ['Web_Port', '-p, --Web_Port ', 'HTTP port number.'], + ['Web_Root', '-w, --Web_Root ', 'Path to serve as website.'], + ['Web_Ssl', '--Web_Ssl ', 'SSL options in JSON string.'], + ], + // 最基础的必须的默认配置，如果用户什么也没有提供 + Web_Protocol: 'http', + Web_Hostname: 'localhost', + Web_Root: '_webroot', // local path to serve as webroot + Web_Index: 'index.html', + // 如果使用虚拟主机 + /* vhosts: [ { Web_Root: 'dist', Web_Index: 'index.html', domainList: ['']} ], */ - }}) + }, + }), }) if (typeof wo.envar.Web_Ssl === 'string') { wo.envar.Web_Ssl = eval(`(${wo.envar.Web_Ssl})`) } -;(function serve() { +;(function serve () { console.log('★★★★★★★★ Starting Server ★★★★★★★★') const server = express() -// const greenlock = require('greenlock-express').create({ -// version: 'draft-11', -// server: 'https://acme-v02.api.letsencrypt.org/directory', // for test: acme-staging-v02 -// agreeTos: true, -// communityMember: false, -// store: require('greenlock-store-fs'), -// email: 'ssl@faronear.org', -// approvedDomains: wo.wo.envar.sslDomains, -// configDir: path.resolve(__dirname, 'ssl'), -// app: server, -// }) + // const greenlock = require('greenlock-express').create({ + // version: 'draft-11', + // server: 'https://acme-v02.api.letsencrypt.org/directory', // for test: acme-staging-v02 + // agreeTos: true, + // communityMember: false, + // store: require('greenlock-store-fs'), + // email: 'ssl@faronear.org', + // approvedDomains: wo.wo.envar.sslDomains, + // configDir: path.resolve(__dirname, 'ssl'), + // app: server, + // }) /*** 通用中间件 ***/ server.use(require('morgan')('dev')) @@ -62,7 +64,7 @@ if (typeof wo.envar.Web_Ssl === 'string') { express.static(path.join(process.cwd(), wo.envar.Web_Root).replace('\\', '/'), { index: wo.envar.Web_Index }) // 可以指定到 node应用之外的目录上。windows里要把 \ 换成 /。 ) //server.use(require('serve-favicon')(path.join(process.cwd(), wo.envar.Web_Root, 'favicon.ico'))) -} else { + } else { let vhost = require('vhost') for (let h of wo.envar.vhosts) { for (let domain of h.domainList) { @@ -88,19 +90,17 @@ if (typeof wo.envar.Web_Ssl === 'string') { webServer = require('http') .createServer(server) .listen(portHttp, function (err) { - if (err) { - console.error(err) + if (err) { + console.error(err) } else { - console.log({time: new Date().toJSON()}, - `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttp}` - ) + console.log({ time: new Date().toJSON() }, `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttp}`) } }) } else if ('https' === wo.envar.Web_Protocol) { let portHttps = wo.envar.Web_Port || 443 webServer = require('https') .createServer( -// wo.wo.envar.Web_Ssl.type==='greenlock' ? greenlock.httpsOptions : + // wo.wo.envar.Web_Ssl.type==='greenlock' ? greenlock.httpsOptions : { key: fs.readFileSync(wo.envar.Web_Ssl.file.key), cert: fs.readFileSync(wo.envar.Web_Ssl.file.cert), @@ -112,35 +112,30 @@ if (typeof wo.envar.Web_Ssl === 'string') { if (err) { console.error(err) } else { - console.log({time: new Date().toJSON()}, - `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttps}` - ) + console.log({ time: new Date().toJSON() }, `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttps}`) } }) } else if ('httpall' === wo.envar.Web_Protocol) { let portHttp = wo.envar.Web_Port?.portHttp || 80 let portHttps = wo.envar.Web_Port?.portHttps || 443 -// if (wo.wo.envar.Web_Ssl.type==='greenlock') { -// greenlock.listen(portHttp, portHttps, function (err) { -// if (err) console.error(err) -// else console.log(`Server listening on [${wo.wo.envar.Web_Protocol}] http=>https://${wo.wo.envar.Web_Hostname}:${portHttp}=>${portHttps} for ${server.settings.env} environment`) -// }) -// }else { + // if (wo.wo.envar.Web_Ssl.type==='greenlock') { + // greenlock.listen(portHttp, portHttps, function (err) { + // if (err) console.error(err) + // else console.log(`Server listening on [${wo.wo.envar.Web_Protocol}] http=>https://${wo.wo.envar.Web_Hostname}:${portHttp}=>${portHttps} for ${server.settings.env} environment`) + // }) + // }else { require('http') - .createServer(function (ask, reply) { + .createServer(function (ask, reply) { reply.writeHead(301, { Location: `https://${ask.headers.host.replace(`:${portHttp}`, `:${portHttps}`)}${ask.url}` }) reply.end() - } - ) - .listen(portHttp, function (err) { - if (err) { - console.error(err) - } else { - console.log({time: new Date().toJSON()}, - `Server redirecting from http://${wo.envar.Web_Hostname}:${portHttp}` - ) - } - }) + }) + .listen(portHttp, function (err) { + if (err) { + console.error(err) + } else { + console.log({ time: new Date().toJSON() }, `Server redirecting from http://${wo.envar.Web_Hostname}:${portHttp}`) + } + }) webServer = require('https') .createServer( { @@ -154,55 +149,49 @@ if (typeof wo.envar.Web_Ssl === 'string') { if (err) { console.error(err) } else { - console.log({time: new Date().toJSON()}, - `Server listening on https://${wo.envar.Web_Hostname}:${portHttps}` - ) + console.log({ time: new Date().toJSON() }, `Server listening on https://${wo.envar.Web_Hostname}:${portHttps}`) } }) -// } + // } } else if ('redirectHttp2Https' === wo.envar.Web_Protocol) { let portHttp = wo.envar.Web_Port?.portHttp || 80 let portHttps = wo.envar.Web_Port?.portHttps || 443 - webServer = server.all('*', function (ask, reply) { - reply.redirect(301, `https://${ask.headers.host.replace(`:${portHttp}`, `:${portHttps}`)}${ask.url}`) - }) - .listen(portHttp, function (err) { - if (err) { - console.error(err) - } else { - console.log({time: new Date().toJSON()}, - `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttp}` - ) - } - }) - }else if ('proxyHttps2Http' === wo.envar.Web_Protocol) { + webServer = server + .all('*', function (ask, reply) { + reply.redirect(301, `https://${ask.headers.host.replace(`:${portHttp}`, `:${portHttps}`)}${ask.url}`) + }) + .listen(portHttp, function (err) { + if (err) { + console.error(err) + } else { + console.log({ time: new Date().toJSON() }, `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttp}`) + } + }) + } else if ('proxyHttps2Http' === wo.envar.Web_Protocol) { let portHttp = wo.envar.Web_Port?.portHttp || 80 let portHttps = wo.envar.Web_Port?.portHttps || 443 - var proxy=require('http-proxy').createProxyServer({ + var proxy = require('http-proxy').createProxyServer({ ssl: { key: fs.readFileSync(wo.envar.Web_Ssl.file.key), cert: fs.readFileSync(wo.envar.Web_Ssl.file.cert), // ca: [ fs.readFileSync(wo.envar.sslCA) ] // https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener }, target: `http://127.0.0.1:${portHttp}`, // iOS 的 AppStore 要求支持IPv6，只能用国外的vultr.com服务器，因此再代理回国内的solet主机。 -// secure: true, // proxying https to https - ws: true // proxying websockets + // secure: true, // proxying https to https + ws: true, // proxying websockets }) proxy.on('error', function (err, req, res) { - res.writeHead(500, { 'Content-Type': 'text/plain' }) + res.writeHead(500, { 'Content-Type': 'text/plain' }) res.end('Proxy Error.') }) proxy.listen(portHttps, function (err) { if (err) { console.error(err) - } else { - console.log({time: new Date().toJSON()}, - `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttps}` - ) + } else { + console.log({ time: new Date().toJSON() }, `Server listening on ${wo.envar.Web_Protocol}://${wo.envar.Web_Hostname}:${portHttps}`) } }) } - return webServer })()