wok-server 0.4.13 → 0.6.0

package/dist/mvc/render/text.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderText = void 0;
-/**
- * 渲染 json 格式数据.
- * @param response 响应信息
- * @param text 文本
- * @param status 状态码，默认 200
- * @returns
- */
-function renderText(response, text, status = 200) {
-    response.setHeader('content-type', 'text/plain; charset=UTF-8');
-    response.statusCode = status;
-    response.end(text);
-}
-exports.renderText = renderText;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderText = void 0;
+/**
+ * 渲染 json 格式数据.
+ * @param response 响应信息
+ * @param text 文本
+ * @param status 状态码，默认 200
+ * @returns
+ */
+function renderText(response, text, status = 200) {
+    response.setHeader('content-type', 'text/plain; charset=UTF-8');
+    response.statusCode = status;
+    response.end(text);
+}
+exports.renderText = renderText;

package/dist/mvc/router.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/mvc/server.js

@@ -1,272 +1,272 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WokServer = void 0;
-const fs_1 = require("fs");
-const http_1 = require("http");
-const https_1 = require("https");
-const os_1 = require("os");
-const path_1 = require("path");
-const log_1 = require("../log");
-const access_log_1 = require("./access-log");
-const config_1 = require("./config");
-const exchange_1 = require("./exchange");
-const render_1 = require("./render");
-const static_1 = require("./static");
-const validation_1 = require("../validation");
-function resolvePath(path) {
-    if ((0, path_1.isAbsolute)(path)) {
-        return path;
-    }
-    return (0, path_1.resolve)(process.cwd(), path);
-}
-/**
- * web 服务
- */
-class WokServer {
-    opts;
-    config;
-    server;
-    interceptors;
-    routers;
-    defaultRouter;
-    staticHandler;
-    constructor(opts) {
-        this.opts = opts;
-        this.config = (0, config_1.getConfig)();
-        // https
-        let tls;
-        if (this.config.tlsEnable) {
-            (0, validation_1.validate)(this.config, {
-                tlsCert: [(0, validation_1.notBlank)()],
-                tlsKey: [(0, validation_1.notBlank)()]
-            });
-            tls = {
-                cert: (0, fs_1.readFileSync)(resolvePath(this.config.tlsCert)),
-                key: (0, fs_1.readFileSync)(resolvePath(this.config.tlsKey))
-            };
-        }
-        // 路由
-        this.routers = opts.routers;
-        this.defaultRouter = this.routers['*'];
-        // 拦截器
-        this.interceptors = [];
-        if (this.config.accessLog) {
-            this.interceptors.push(access_log_1.accessLogInterceptor);
-        }
-        if (opts.interceptors) {
-            this.interceptors.push(...opts.interceptors);
-        }
-        // 静态处理
-        if (opts.static) {
-            this.staticHandler = new static_1.StaticHandler(opts.static);
-        }
-        // 主服务
-        if (!tls) {
-            this.server = (0, http_1.createServer)((req, res) => {
-                res.setHeader('Server', 'Wok Server');
-                res.on('error', error => {
-                    // 如果响应流发生错误，只能把信息记录下来
-                    (0, log_1.getLogger)().error(`Response Error：${req.url}`, error);
-                });
-                this.handleRequest(req, res).catch(error => {
-                    (0, log_1.getLogger)().error(`Handle request failed：${req.url}`, error);
-                    if (!res.writableEnded) {
-                        // 响应 500
-                        (0, render_1.renderError)(res, error.message ? error.message : 'Internal Server Error', 500);
-                    }
-                });
-            });
-        }
-        else {
-            this.server = (0, https_1.createServer)({
-                key: tls.key,
-                cert: tls.cert
-            }, (req, res) => {
-                res.setHeader('Server', 'Wok Server');
-                res.on('error', error => {
-                    // 如果响应流发生错误，只能把信息记录下来
-                    (0, log_1.getLogger)().error(`Response Error：${req.url}`, error);
-                });
-                this.handleRequest(req, res).catch(error => {
-                    (0, log_1.getLogger)().error(`Handle request failed：${req.url}`, error);
-                    if (!res.writableEnded) {
-                        // 响应 500
-                        (0, render_1.renderError)(res, error.message ? error.message : 'Internal Server Error', 500);
-                    }
-                });
-            });
-        }
-        this.server.setTimeout(this.config.timeout);
-        this.server.on('timeout', (socket) => {
-            socket.end('HTTP/1.1 408 Timeout\r\ncontent-type: application/json; charset=utf-8\r\n\r\n{"message":"Request timeout"}');
-        });
-    }
-    /**
-     * 处理请求，完成拦截器和路由的流程.
-     *
-     * @param req
-     * @param res
-     */
-    async handleRequest(req, res) {
-        req.socket.remoteAddress;
-        const { method } = req;
-        // cros 支持
-        res.setHeader('Access-Control-Allow-Origin', this.config.corsAllowOrigin);
-        res.setHeader('Access-Control-Allow-Headers', this.config.corsAllowHeaders);
-        res.setHeader('Access-Control-Allow-Methods', this.config.corsAllowMethods);
-        if (method === 'OPTIONS') {
-            res.statusCode = 200;
-            res.end();
-            return;
-        }
-        const exchange = new exchange_1.ServerExchange(req, res);
-        // 顺序执行拦截器
-        await this.handleInterceptor(0, exchange, req, res);
-    }
-    /**
-     * 处理拦截器.
-     * @param idx 当前要执行的拦截器下标
-     * @param exchange 传输对象
-     * @param req
-     * @param res
-     */
-    async handleInterceptor(idx, exchange, req, res) {
-        const interceptor = this.interceptors[idx];
-        // 到最后一个了，那么执行路由处理
-        if (!interceptor) {
-            await this.handleRouter(exchange);
-            return;
-        }
-        await interceptor(exchange, () => this.handleInterceptor(idx + 1, exchange, req, res));
-    }
-    /**
-     * 处理路由.
-     * @param exchange
-     * @param routers
-     * @param staticSettings
-     * @returns
-     */
-    async handleRouter(exchange) {
-        const url = exchange.request.url;
-        if (url === undefined) {
-            return;
-        }
-        // 判定路由
-        const idx = url.indexOf('?');
-        let path = idx === -1 ? url : url.substring(0, idx);
-        const router = this.routers[path];
-        if (!router) {
-            // 路由找不不到，尝试静态文件
-            if (this.staticHandler) {
-                const method = (exchange.request.method || '').toLowerCase();
-                if (method === 'head') {
-                    if (await this.staticHandler.handleHead(path, exchange.response)) {
-                        return;
-                    }
-                }
-                if (method === 'get') {
-                    if (await this.staticHandler.handleGet(exchange.request, exchange.response, path)) {
-                        return;
-                    }
-                }
-            }
-            this.respond404(exchange, path);
-            return;
-        }
-        // 执行路由
-        await router(exchange);
-        // 在路由顺利处理的情况下，如果 res 没有 end ，就表示响应没有完成
-        // 也就是说路由没有做响应处理，或处理没有完成就结束了，给予错误提示
-        if (!exchange.response.writableEnded) {
-            throw new Error(`RouterHandler unresponsive, url: ${url}`);
-        }
-    }
-    /**
-     * 404响应
-     *
-     * @param exchange
-     * @param path
-     */
-    async respond404(exchange, path) {
-        if (this.defaultRouter) {
-            await this.defaultRouter(exchange);
-        }
-        else {
-            exchange.respondErrMsg(`${path} not found`, 404);
-        }
-    }
-    /**
-     * 启动
-     */
-    async start() {
-        if (this.opts.preHandler) {
-            await this.opts.preHandler(this.server);
-        }
-        await new Promise((resolve, reject) => {
-            this.server.on('error', e => {
-                if (e.code === 'EADDRINUSE') {
-                    reject(`Port ${this.config.port} is already in use.`);
-                }
-                else {
-                    reject(e);
-                }
-            });
-            this.server.listen(this.config.port, resolve);
-        });
-        console.log('App running at: ');
-        let portOmitted = (this.server instanceof https_1.Server && this.config.port === 443) ||
-            (this.server instanceof http_1.Server && this.config.port === 80);
-        this.getIpv4List().forEach(ip => {
-            if (portOmitted) {
-                console.log(`http://${ip}`);
-            }
-            else {
-                console.log(`http://${ip}:${this.config.port}`);
-            }
-        });
-    }
-    /**
-     * 获取 ipv4 地址列表
-     * @returns
-     */
-    getIpv4List() {
-        const ifs = (0, os_1.networkInterfaces)();
-        const res = [];
-        for (const name in ifs) {
-            const list = ifs[name];
-            if (!list) {
-                continue;
-            }
-            res.push(...list.filter(info => info.family === 'IPv4').map(info => info.address));
-        }
-        return res;
-    }
-    /**
-     * 删除服务器端静态资源缓存
-     * @param path
-     */
-    removeServerStaticCache(path) {
-        if (this.staticHandler) {
-            this.staticHandler.removeServerCache(path);
-        }
-    }
-    /**
-     * 停止
-     */
-    async stop() {
-        if (!this.server.listening) {
-            return;
-        }
-        await new Promise((res, rej) => {
-            this.server.close(err => {
-                if (err) {
-                    rej(err);
-                }
-                else {
-                    res();
-                }
-            });
-        });
-    }
-}
-exports.WokServer = WokServer;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WokServer = void 0;
+const fs_1 = require("fs");
+const http_1 = require("http");
+const https_1 = require("https");
+const os_1 = require("os");
+const path_1 = require("path");
+const log_1 = require("../log");
+const access_log_1 = require("./access-log");
+const config_1 = require("./config");
+const exchange_1 = require("./exchange");
+const render_1 = require("./render");
+const static_1 = require("./static");
+const validation_1 = require("../validation");
+function resolvePath(path) {
+    if ((0, path_1.isAbsolute)(path)) {
+        return path;
+    }
+    return (0, path_1.resolve)(process.cwd(), path);
+}
+/**
+ * web 服务
+ */
+class WokServer {
+    opts;
+    config;
+    server;
+    interceptors;
+    routers;
+    defaultRouter;
+    staticHandler;
+    constructor(opts) {
+        this.opts = opts;
+        this.config = (0, config_1.getConfig)();
+        // https
+        let tls;
+        if (this.config.tlsEnable) {
+            (0, validation_1.validate)(this.config, {
+                tlsCert: [(0, validation_1.notBlank)()],
+                tlsKey: [(0, validation_1.notBlank)()]
+            });
+            tls = {
+                cert: (0, fs_1.readFileSync)(resolvePath(this.config.tlsCert)),
+                key: (0, fs_1.readFileSync)(resolvePath(this.config.tlsKey))
+            };
+        }
+        // 路由
+        this.routers = opts.routers;
+        this.defaultRouter = this.routers['*'];
+        // 拦截器
+        this.interceptors = [];
+        if (this.config.accessLog) {
+            this.interceptors.push(access_log_1.accessLogInterceptor);
+        }
+        if (opts.interceptors) {
+            this.interceptors.push(...opts.interceptors);
+        }
+        // 静态处理
+        if (opts.static) {
+            this.staticHandler = new static_1.StaticHandler(opts.static);
+        }
+        // 主服务
+        if (!tls) {
+            this.server = (0, http_1.createServer)((req, res) => {
+                res.setHeader('Server', 'Wok Server');
+                res.on('error', error => {
+                    // 如果响应流发生错误，只能把信息记录下来
+                    (0, log_1.getLogger)().error(`Response Error：${req.url}`, error);
+                });
+                this.handleRequest(req, res).catch(error => {
+                    (0, log_1.getLogger)().error(`Handle request failed：${req.url}`, error);
+                    if (!res.writableEnded) {
+                        // 响应 500
+                        (0, render_1.renderError)(res, error.message ? error.message : 'Internal Server Error', 500);
+                    }
+                });
+            });
+        }
+        else {
+            this.server = (0, https_1.createServer)({
+                key: tls.key,
+                cert: tls.cert
+            }, (req, res) => {
+                res.setHeader('Server', 'Wok Server');
+                res.on('error', error => {
+                    // 如果响应流发生错误，只能把信息记录下来
+                    (0, log_1.getLogger)().error(`Response Error：${req.url}`, error);
+                });
+                this.handleRequest(req, res).catch(error => {
+                    (0, log_1.getLogger)().error(`Handle request failed：${req.url}`, error);
+                    if (!res.writableEnded) {
+                        // 响应 500
+                        (0, render_1.renderError)(res, error.message ? error.message : 'Internal Server Error', 500);
+                    }
+                });
+            });
+        }
+        this.server.setTimeout(this.config.timeout);
+        this.server.on('timeout', (socket) => {
+            socket.end('HTTP/1.1 408 Timeout\r\ncontent-type: application/json; charset=utf-8\r\n\r\n{"message":"Request timeout"}');
+        });
+    }
+    /**
+     * 处理请求，完成拦截器和路由的流程.
+     *
+     * @param req
+     * @param res
+     */
+    async handleRequest(req, res) {
+        req.socket.remoteAddress;
+        const { method } = req;
+        // cros 支持
+        res.setHeader('Access-Control-Allow-Origin', this.config.corsAllowOrigin);
+        res.setHeader('Access-Control-Allow-Headers', this.config.corsAllowHeaders);
+        res.setHeader('Access-Control-Allow-Methods', this.config.corsAllowMethods);
+        if (method === 'OPTIONS') {
+            res.statusCode = 200;
+            res.end();
+            return;
+        }
+        const exchange = new exchange_1.ServerExchange(req, res);
+        // 顺序执行拦截器
+        await this.handleInterceptor(0, exchange, req, res);
+    }
+    /**
+     * 处理拦截器.
+     * @param idx 当前要执行的拦截器下标
+     * @param exchange 传输对象
+     * @param req
+     * @param res
+     */
+    async handleInterceptor(idx, exchange, req, res) {
+        const interceptor = this.interceptors[idx];
+        // 到最后一个了，那么执行路由处理
+        if (!interceptor) {
+            await this.handleRouter(exchange);
+            return;
+        }
+        await interceptor(exchange, () => this.handleInterceptor(idx + 1, exchange, req, res));
+    }
+    /**
+     * 处理路由.
+     * @param exchange
+     * @param routers
+     * @param staticSettings
+     * @returns
+     */
+    async handleRouter(exchange) {
+        const url = exchange.request.url;
+        if (url === undefined) {
+            return;
+        }
+        // 判定路由
+        const idx = url.indexOf('?');
+        let path = idx === -1 ? url : url.substring(0, idx);
+        const router = this.routers[path];
+        if (!router) {
+            // 路由找不不到，尝试静态文件
+            if (this.staticHandler) {
+                const method = (exchange.request.method || '').toLowerCase();
+                if (method === 'head') {
+                    if (await this.staticHandler.handleHead(path, exchange.response)) {
+                        return;
+                    }
+                }
+                if (method === 'get') {
+                    if (await this.staticHandler.handleGet(exchange.request, exchange.response, path)) {
+                        return;
+                    }
+                }
+            }
+            this.respond404(exchange, path);
+            return;
+        }
+        // 执行路由
+        await router(exchange);
+        // 在路由顺利处理的情况下，如果 res 没有 end ，就表示响应没有完成
+        // 也就是说路由没有做响应处理，或处理没有完成就结束了，给予错误提示
+        if (!exchange.response.writableEnded) {
+            throw new Error(`RouterHandler unresponsive, url: ${url}`);
+        }
+    }
+    /**
+     * 404响应
+     *
+     * @param exchange
+     * @param path
+     */
+    async respond404(exchange, path) {
+        if (this.defaultRouter) {
+            await this.defaultRouter(exchange);
+        }
+        else {
+            exchange.respondErrMsg(`${path} not found`, 404);
+        }
+    }
+    /**
+     * 启动
+     */
+    async start() {
+        if (this.opts.preHandler) {
+            await this.opts.preHandler(this.server);
+        }
+        await new Promise((resolve, reject) => {
+            this.server.on('error', e => {
+                if (e.code === 'EADDRINUSE') {
+                    reject(`Port ${this.config.port} is already in use.`);
+                }
+                else {
+                    reject(e);
+                }
+            });
+            this.server.listen(this.config.port, resolve);
+        });
+        console.log('App running at: ');
+        let portOmitted = (this.server instanceof https_1.Server && this.config.port === 443) ||
+            (this.server instanceof http_1.Server && this.config.port === 80);
+        this.getIpv4List().forEach(ip => {
+            if (portOmitted) {
+                console.log(`http://${ip}`);
+            }
+            else {
+                console.log(`http://${ip}:${this.config.port}`);
+            }
+        });
+    }
+    /**
+     * 获取 ipv4 地址列表
+     * @returns
+     */
+    getIpv4List() {
+        const ifs = (0, os_1.networkInterfaces)();
+        const res = [];
+        for (const name in ifs) {
+            const list = ifs[name];
+            if (!list) {
+                continue;
+            }
+            res.push(...list.filter(info => info.family === 'IPv4').map(info => info.address));
+        }
+        return res;
+    }
+    /**
+     * 删除服务器端静态资源缓存
+     * @param path
+     */
+    removeServerStaticCache(path) {
+        if (this.staticHandler) {
+            this.staticHandler.removeServerCache(path);
+        }
+    }
+    /**
+     * 停止
+     */
+    async stop() {
+        if (!this.server.listening) {
+            return;
+        }
+        await new Promise((res, rej) => {
+            this.server.close(err => {
+                if (err) {
+                    rej(err);
+                }
+                else {
+                    res();
+                }
+            });
+        });
+    }
+}
+exports.WokServer = WokServer;