update

Author: kscript

README.md

@@ -195,16 +195,31 @@ mockData 属性, 存放客户端请求api时的返回数据, 以及对返回数
        * @param {object} params 请求参数
        * @param {any} result 默认返回结果的副本
        * @desc relay 可以是一个url字符串
-       * @returns 参数数组, 会通过 apply 传给 request 模块, 参数说明参考 request 模块, (预置了最后一个函数参数, 建议不要传这个参数) request中的传参字段: get为qs, post为form
+       * @returns string/object/array
       */
       relay: (method, params, result) => {
-        return ['url', {}, () => {}]
+        let url = ''
+        // 返回值用于给 request 模块传参, 调用逻辑:
+        // request.apply(request, Array.isArray(returns) ? returns : [returns])
+        // request中的传参字段: get为qs, post为form
+        return url
+        // return {
+        //   url,
+        //   [/post/i.test(method) ? 'form' : 'qs']: {
+        //     test: 123
+        //   }
+        // }
+        // return [url, {
+        //   [/post/i.test(method) ? 'form' : 'qs']: {
+        //     test: 123
+        //   }
+        // }]
       },
 
       // 请求方法, 返回数据
       // 返回数据可以使用 mockjs 来填充数据, 也可以直接写json
 
-      // 请求方法为函数时, 参数与其它方法一致, 但result为空对象, 返回值作为返回数据
+      // 请求方法为函数时, 参数与format/error/ralay等方法一致, 但result为空对象, 返回值作为返回数据
       // get: (method, params, result) => {}
       get: {
         // ...

index.js

@@ -186,9 +186,37 @@ var getInfo = function (req, option, headers) {
         option.crossDomain ? headers : {}), option.headConfig)
     };
 };
+var formatResult = function (_a) {
+    var data = _a.data, method = _a.method, params = _a.params, result = _a.result;
+    try {
+        result = JSON.parse(JSON.stringify(typeof data[method] == 'function'
+            ? data[method](method, params, result)
+            : data[method] instanceof Object
+                ? data[method]
+                : {}));
+    }
+    catch (e) {
+        result = {};
+    }
+    if (!(result instanceof Object)) {
+        result = {};
+    }
+    return result;
+};
 var mockResult = function (result) {
     return result instanceof Object ? Mock.mock(result) : result;
 };
+var authHandler = function (_a) {
+    var http = _a.http, data = _a.data, option = _a.option, urlKey = _a.urlKey, headConfig = _a.headConfig;
+    if (urlKey !== option.loginUrl && option.bounded && !data.public && !auth.verify()) {
+        http.writeHead(401, headConfig);
+        http.end({
+            code: 401,
+            message: urlKey && urlKey === option.logoutUrl ? '退出失败' : '权限不足, 请先登录'
+        });
+        return false;
+    }
+};
 var errorHandler = function (_a) {
     var url = _a.url, http = _a.http, data = _a.data, method = _a.method, params = _a.params, result = _a.result, headConfig = _a.headConfig;
     if (typeof data.error === 'function') {
@@ -345,23 +373,6 @@ var createServer = function (option, callback) {
         createServer(option, callback);
     });
 };
-var formatResult = function (_a) {
-    var data = _a.data, method = _a.method, params = _a.params, result = _a.result;
-    try {
-        result = JSON.parse(JSON.stringify(typeof data[method] == 'function'
-            ? data[method](method, params, result)
-            : data[method] instanceof Object
-                ? data[method]
-                : {}));
-    }
-    catch (e) {
-        result = {};
-    }
-    if (!(result instanceof Object)) {
-        result = {};
-    }
-    return result;
-};
 /**
  * 启动mock服务
  * @func
@@ -424,6 +435,10 @@ var Server$1 = function (option, callback) {
                 return;
             }
             // 3. 处理错误
+            if (authHandler(allOption) === false) {
+                return;
+            }
+            // 3. 处理错误
             if (errorHandler(allOption) === false) {
                 return;
             }

src/server.ts

@@ -4,7 +4,7 @@ import auth from './auth';
 import config from './config';
 import rules from './rules';
 import * as https from 'https';
-import { getInfo, mockResult, Http, errorHandler, relayHandler, methodHandler } from './utils'
+import { Http, getInfo, formatResult, mockResult, authHandler, errorHandler, relayHandler, methodHandler } from './utils'
 import * as  fs from 'fs';
 const server = jsonServer.create()
 // 路径从根目录开始?
@@ -43,27 +43,6 @@ const createServer = (option: anyObject, callback?: Function) => {
         createServer(option, callback)
     })
 }
-const formatResult = ({
-    data, method, params, result
-}) => {
-    try {
-        result = JSON.parse(
-            JSON.stringify(
-                typeof data[method] == 'function' 
-                ? data[method](method, params, result) 
-                : data[method] instanceof Object 
-                    ? data[method]
-                    : {}
-            )
-        )
-    } catch (e) {
-        result = {}
-    }
-    if (!(result instanceof Object)) {
-        result = {}
-    }
-    return result
-}
 
 /**
  * 启动mock服务
@@ -138,6 +117,8 @@ const Server = (option: anyObject, callback?: Function) => {
                 return
             }
             // 3. 处理错误
+            if (authHandler(allOption) === false) { return }
+            // 3. 处理错误
             if (errorHandler(allOption) === false) { return }
             // 4. 处理转发请求
             if (relayHandler(allOption) === false) { return }

src/utils.ts

@@ -35,10 +35,47 @@ export const getInfo = (req, option, headers) => {
         )
     }
 }
+export const formatResult = ({
+    data, method, params, result
+}) => {
+    try {
+        result = JSON.parse(
+            JSON.stringify(
+                typeof data[method] == 'function' 
+                ? data[method](method, params, result) 
+                : data[method] instanceof Object 
+                    ? data[method]
+                    : {}
+            )
+        )
+    } catch (e) {
+        result = {}
+    }
+    if (!(result instanceof Object)) {
+        result = {}
+    }
+    return result
+}
+
 export const mockResult = (result) => {
     return result instanceof Object ? Mock.mock(result) : result
 }
-
+export const authHandler = ({
+    http,
+    data,
+    option,
+    urlKey,
+    headConfig
+}) => {
+    if (urlKey !== option.loginUrl && option.bounded && !data.public && !auth.verify()) {
+        http.writeHead(401, headConfig)
+        http.end({
+            code: 401,
+            message: urlKey && urlKey === option.logoutUrl ? '退出失败' : '权限不足, 请先登录'
+        })
+        return false
+    }
+}
 export const errorHandler = ({
     url,
     http,
@@ -175,7 +212,9 @@ export const methodHandler = ({
 export default {
     Http,
     getInfo,
+    formatResult,
     mockResult,
+    authHandler,
     errorHandler, 
     relayHandler,
     methodHandler