skybase 0.1.91 → 0.1.92

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.1.91](https://github.com/kongnet/skybase/compare/v0.1.90...v0.1.91) (2022-05-16)
+
+
+### :memo:
+
+* 增加RTS例子 ([ed4d52c](https://github.com/kongnet/skybase/commit/ed4d52ceeb04bd8eaba839117588ff90e4c7aac3))
+
+
+
 ## [0.1.90](https://github.com/kongnet/skybase/compare/v0.1.89...v0.1.90) (2022-05-01)
 
 

package/lib/middleware/sky-check-param.js

@@ -3,8 +3,8 @@
  * */
 
 const $ = require('meeko')
-const $G = global.$G = global.$G || {}
-const api = $G.api = $G.api || {}
+const $G = (global.$G = global.$G || {})
+const api = ($G.api = $G.api || {})
 
 const config = require('../../skyconfig')
 
@@ -12,9 +12,20 @@ const apiCheckLog = function (url, obj, method, oldParam, ctx) {
   if (config.logger) {
     let checkColor = 'c'
     obj = obj || {}
-    if (obj.code >= 400) { checkColor = 'y' }
+    if (obj.code >= 400) {
+      checkColor = 'y'
+    }
     let methodStr = method.toUpperCase()
-    $.log($.c[{ 'GET': 'dimg', 'POST': 'dimy' }[methodStr]](`[ ${methodStr} ]`) + $.c.dimy(url.join ? url.join('/') : url) + $.c[checkColor](JSON.stringify(obj || '{}')), '实际参数:', oldParam ? $.c.r(JSON.stringify(oldParam || '{}')) : '', 'header参数:', $.c.c(JSON.stringify(ctx.header || '{}')))
+    $.log(
+      $.c[{ GET: 'dimg', POST: 'dimy' }[methodStr]]?.(`[ ${methodStr} ]`) ??
+        $.c.r(`[ ${methodStr} ]`) +
+          $.c.dimy(url.join ? url.join('/') : url) +
+          $.c[checkColor](JSON.stringify(obj || '{}')),
+      '实际参数:',
+      oldParam ? $.c.r(JSON.stringify(oldParam || '{}')) : '',
+      'header参数:',
+      $.c.c(JSON.stringify(ctx.header || '{}'))
+    )
   }
 }
 
@@ -22,7 +33,8 @@ const apiCheckLog = function (url, obj, method, oldParam, ctx) {
 const checkRedirect = (ctx, apiPath) => {
   if (config.redirect) {
     let url = config.redirect[apiPath] || null
-    if (url) { // 跳转
+    if (url) {
+      // 跳转
       if (ctx.request.header) {
         url = `${ctx.request.header['x-forwarded-prefix'] || ''}${url}`
       }
@@ -48,7 +60,7 @@ const checkCache = (ctx, method, url) => {
 // 快速检查是否可以不执行具体方法
 const preCheck = (ctx, method, url, apiPath) => {
   if (!['get', 'post'].includes(method)) {
-    ctx.throwCode(ctx.status, '只支持get/post方式')
+    ctx.throwCode(ctx.status, '只支持get/post/all方式')
     return { succ: false, continue: false }
   }
   if (checkRedirect(ctx, apiPath)) {
@@ -64,8 +76,16 @@ const preCheck = (ctx, method, url, apiPath) => {
   let apiSetting = api[apiPath]
   //NOTICE: 支持动态路由，但找不到的时候性能有点损失
   if (!apiSetting) {
-    apiSetting = api[Object.keys(api).find(x => x.includes(':')
-      && new RegExp(x.replace(/(:[0-9a-z]+)/g, '[0-9a-z]+'), 'g').test(apiPath))]
+    apiSetting =
+      api[
+        Object.keys(api).find(
+          x =>
+            x.includes(':') &&
+            new RegExp(x.replace(/(:[0-9a-z]+)/g, '[0-9a-z]+'), 'g').test(
+              apiPath
+            )
+        )
+      ]
   }
   if (!apiSetting) {
     ctx.throwCode(404, '接口不存在')
@@ -73,7 +93,8 @@ const preCheck = (ctx, method, url, apiPath) => {
   }
 
   const needMethod = apiSetting.method
-  if (method !== needMethod && needMethod !== 'all') { // 允许get和post都接入
+  if (method !== needMethod && needMethod !== 'all') {
+    // 允许get和post都接入
     $.err(`方法类型不对，应为${needMethod}，不能为${method}`)
     ctx.throwCode(405, '方法类型不对')
     return { succ: false, continue: false }
@@ -86,7 +107,12 @@ module.exports = async (ctx, next) => {
   const method = ctx.method.toLowerCase()
   const url = ctx.request.url
   const apiPath = url.split('?')[0]
-  const { continue: canContinue, succ, needMethod, apiSetting } = preCheck(ctx, method, url, apiPath)
+  const { continue: canContinue, succ, needMethod, apiSetting } = preCheck(
+    ctx,
+    method,
+    url,
+    apiPath
+  )
   if (!canContinue) {
     apiCheckLog(apiPath, ctx.body, method, null, ctx)
     return succ ? 1 : 0
@@ -94,7 +120,8 @@ module.exports = async (ctx, next) => {
 
   ctx.apiSetting = apiSetting
 
-  const params = method === 'get' ? ctx.query || {} : ctx.request.fields || ctx.body || {}
+  const params =
+    method === 'get' ? ctx.query || {} : ctx.request.fields || ctx.body || {}
 
   // 下面是原来有的逻辑，感觉不安全，所以去掉了
   // NOTICE 如果是上传文件不过滤参数 参数里有files的即为上传
@@ -106,7 +133,10 @@ module.exports = async (ctx, next) => {
   //   }
   // }
 
-  ctx.checkedData = $.tools.checkParam(params, needMethod === 'all' && apiSetting.param[method] || apiSetting.param)
+  ctx.checkedData = $.tools.checkParam(
+    params,
+    (needMethod === 'all' && apiSetting.param[method]) || apiSetting.param
+  )
   apiCheckLog(apiPath, ctx.checkedData, method, params, ctx)
   if (ctx.checkedData.code >= 400) {
     return ctx.throwCode(400, ctx.checkedData.msg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skybase",
-  "version": "0.1.91",
+  "version": "0.1.92",
   "description": "sky框架",
   "main": "index.js",
   "directories": {