abler-api 0.1.1 → 0.1.6

package/dist/cjs/pp-util.js

@@ -293,6 +293,31 @@ class apiUtil$1 {
    */
 
 
+  static sendResponse(response, promise) {
+    promise.then(function (data) {
+      if (!response.finished) {
+        try {
+          response.send(data);
+        } catch (e) {
+          console.log(`response.send 出错了，req.url: ${response.req.url}, response：`, response);
+          console.log("异常信息", e);
+        }
+      }
+    }, function (error) {
+      console.log('ERROR:', error);
+
+      if (!response.finished) {
+        response.send(error);
+      }
+    });
+  }
+  /**
+   * API 服务结束，包装数据并发送响应
+   * @param response
+   * @param promise
+   */
+
+
   static async responseOf(response, promise) {
     promise.then(function (data) {
       // console.log('RES:', apiSuccess(data));
@@ -967,6 +992,50 @@ class apiUtil$1 {
 
   static tokenDataExist(token) {
     return kvStorage.stored(token);
+  }
+
+  static parametersOK(params) {
+    configNeeded();
+    let paramSufix = params._param_sufix || "";
+
+    for (let i = 1; i < arguments.length; i++) {
+      let paramName = arguments[i];
+      let paramExists = false;
+
+      if (paramName.includes("/")) {
+        let names = paramName.split("/"); // if (params[names[0]]) {
+        //     paramExists = true;
+        // } else {
+        //     if (params[names[1]]) {
+        //         paramExists = true;
+        //         params[names[0]] = params[names[1]];
+        //         delete params[names[1]];
+        //     }
+        // }
+
+        for (let ind in names) {
+          let name = names[ind];
+
+          if (typeof params[name] != 'undefined') {
+            paramExists = true;
+            break;
+          }
+
+          if (paramSufix != "" && typeof params[name + paramSufix] != 'undefined') {
+            paramExists = true;
+            break;
+          }
+        }
+
+        paramName = `${paramName} 之一`;
+      } else {
+        paramExists = typeof params[paramName] != 'undefined' || typeof params[paramName + paramSufix] != 'undefined';
+      }
+
+      if (!paramExists) return ppUtil$1.errorPormise(err.ERROR(err.PARAMETER_NEEDED, paramName));
+    }
+
+    return Promise.resolve(paramSufix);
   } //#endregion
   //region ====中间件
 

package/dist/es/pp-util.js

@@ -285,6 +285,31 @@ class apiUtil$1 {
    */
 
 
+  static sendResponse(response, promise) {
+    promise.then(function (data) {
+      if (!response.finished) {
+        try {
+          response.send(data);
+        } catch (e) {
+          console.log(`response.send 出错了，req.url: ${response.req.url}, response：`, response);
+          console.log("异常信息", e);
+        }
+      }
+    }, function (error) {
+      console.log('ERROR:', error);
+
+      if (!response.finished) {
+        response.send(error);
+      }
+    });
+  }
+  /**
+   * API 服务结束，包装数据并发送响应
+   * @param response
+   * @param promise
+   */
+
+
   static async responseOf(response, promise) {
     promise.then(function (data) {
       // console.log('RES:', apiSuccess(data));
@@ -959,6 +984,50 @@ class apiUtil$1 {
 
   static tokenDataExist(token) {
     return kvStorage.stored(token);
+  }
+
+  static parametersOK(params) {
+    configNeeded();
+    let paramSufix = params._param_sufix || "";
+
+    for (let i = 1; i < arguments.length; i++) {
+      let paramName = arguments[i];
+      let paramExists = false;
+
+      if (paramName.includes("/")) {
+        let names = paramName.split("/"); // if (params[names[0]]) {
+        //     paramExists = true;
+        // } else {
+        //     if (params[names[1]]) {
+        //         paramExists = true;
+        //         params[names[0]] = params[names[1]];
+        //         delete params[names[1]];
+        //     }
+        // }
+
+        for (let ind in names) {
+          let name = names[ind];
+
+          if (typeof params[name] != 'undefined') {
+            paramExists = true;
+            break;
+          }
+
+          if (paramSufix != "" && typeof params[name + paramSufix] != 'undefined') {
+            paramExists = true;
+            break;
+          }
+        }
+
+        paramName = `${paramName} 之一`;
+      } else {
+        paramExists = typeof params[paramName] != 'undefined' || typeof params[paramName + paramSufix] != 'undefined';
+      }
+
+      if (!paramExists) return ppUtil$1.errorPormise(err.ERROR(err.PARAMETER_NEEDED, paramName));
+    }
+
+    return Promise.resolve(paramSufix);
   } //#endregion
   //region ====中间件
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.1",
+  "version": "0.1.6",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "module": "./dist/es/pp-util.js",
@@ -15,8 +15,8 @@
   "license": "ISC",
   "dependencies": {
     "q": "^1.5.1",
-    "abler-util": "^0.1.6",
-    "abler-db": "^0.1.3"
+    "abler-util": "~0.1.6",
+    "abler-db": "~0.1.3"
   },
   "devDependencies": {
     "@babel/core": "^7.18.5",