skybase 0.1.111 → 0.1.112
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +5 -0
- package/lib/sky.js +9 -38
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
package/lib/sky.js
CHANGED
|
@@ -1,29 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
'use strict'
|
|
3
|
-
const os = require('os')
|
|
4
|
-
|
|
5
|
-
const networkInterfaces = os.networkInterfaces()
|
|
6
|
-
let localIP = Object.keys(networkInterfaces).map((ifname, index) => {
|
|
7
|
-
const iface = networkInterfaces[ifname]
|
|
8
|
-
const arr = iface.map(x => {
|
|
9
|
-
if (
|
|
10
|
-
x?.family === 'IPv4' &&
|
|
11
|
-
!x?.internal &&
|
|
12
|
-
x?.mac !== '00:00:00:00:00:00'
|
|
13
|
-
) {
|
|
14
|
-
return x.address
|
|
15
|
-
}
|
|
16
|
-
})
|
|
17
|
-
return arr.filter(Boolean)
|
|
18
|
-
})
|
|
19
|
-
|
|
20
3
|
const $G = (global.$G = global.$G || {})
|
|
21
4
|
// global.Promise = require('bluebird')
|
|
22
5
|
|
|
23
6
|
const skyExt = require('./sky_extend')
|
|
24
7
|
const path = require('path')
|
|
25
8
|
const http = require('http')
|
|
26
|
-
const https = require('https')
|
|
27
9
|
|
|
28
10
|
// 全局对象
|
|
29
11
|
const $ = (global.$ = require('meeko'))
|
|
@@ -72,16 +54,8 @@ const getPort = async (port, beforeListenPort) => {
|
|
|
72
54
|
return portTemp
|
|
73
55
|
}
|
|
74
56
|
|
|
75
|
-
const createWebServer = async (port,
|
|
76
|
-
|
|
77
|
-
let server
|
|
78
|
-
if (httpsOption) {
|
|
79
|
-
option = httpsOption
|
|
80
|
-
server = https.createServer(option, app.callback())
|
|
81
|
-
} else {
|
|
82
|
-
server = http.createServer(app.callback())
|
|
83
|
-
}
|
|
84
|
-
|
|
57
|
+
const createWebServer = async (port, ip, afterCreateServer) => {
|
|
58
|
+
const server = http.createServer(app.callback())
|
|
85
59
|
if (afterCreateServer) {
|
|
86
60
|
await afterCreateServer(server)
|
|
87
61
|
}
|
|
@@ -100,7 +74,7 @@ const createWebServer = async (port, afterCreateServer, httpsOption) => {
|
|
|
100
74
|
}
|
|
101
75
|
})
|
|
102
76
|
|
|
103
|
-
server.listen(port)
|
|
77
|
+
server.listen(port, ip)
|
|
104
78
|
return server
|
|
105
79
|
}
|
|
106
80
|
|
|
@@ -110,7 +84,7 @@ async function init (option, cbFun) {
|
|
|
110
84
|
const {
|
|
111
85
|
name,
|
|
112
86
|
port,
|
|
113
|
-
|
|
87
|
+
ipAddress,
|
|
114
88
|
beforeMount,
|
|
115
89
|
beforeLoadMiddlewares,
|
|
116
90
|
afterLoadMiddlewares,
|
|
@@ -121,7 +95,7 @@ async function init (option, cbFun) {
|
|
|
121
95
|
rootDir,
|
|
122
96
|
middlewareDir
|
|
123
97
|
} = config
|
|
124
|
-
|
|
98
|
+
let ip = ipAddress || '0.0.0.0'
|
|
125
99
|
if (beforeMount) {
|
|
126
100
|
skyExt.artStage('beforeMount')
|
|
127
101
|
await beforeMount(config)
|
|
@@ -183,15 +157,12 @@ async function init (option, cbFun) {
|
|
|
183
157
|
|
|
184
158
|
// 侦听端口
|
|
185
159
|
const portFinal = await getPort(port, beforeListenPort)
|
|
186
|
-
$G.server = await createWebServer(portFinal,
|
|
160
|
+
$G.server = await createWebServer(portFinal, ip, afterCreateServer)
|
|
161
|
+
|
|
187
162
|
$.log(
|
|
188
163
|
$.c.g('✔'),
|
|
189
|
-
`${$.c.y(name)} WebServer [${$.c.y(
|
|
190
|
-
|
|
191
|
-
.join(',')}] Listen at`,
|
|
192
|
-
`${$.c.y(portFinal)} ${
|
|
193
|
-
https ? 'https' : 'http'
|
|
194
|
-
}://127.0.0.1:${portFinal}/`
|
|
164
|
+
`${$.c.y(name)} WebServer [${$.c.y(ip)}] Listen at`,
|
|
165
|
+
`${$.c.y(portFinal)}`
|
|
195
166
|
)
|
|
196
167
|
skyExt.artTxt(name, 'Graceful')
|
|
197
168
|
}
|