upcore-tcp 0.0.9 → 0.1.0

package/lib/checkType.js

@@ -69,7 +69,7 @@ function isValidEmail(s){
     return at > 0 && dot > at + 1 && dot < s.length - 1;
 }
 
-module.exports = function({type, length, format, list, mime}, data){
+module.exports = function({type, length, format, list}, data){
     let status = false;
     let len = false;
 
@@ -97,17 +97,6 @@ module.exports = function({type, length, format, list, mime}, data){
         return false;
     }
 
-    if(mime !== undefined){
-        status = false;
-        if(mime.includes(data.type)){
-            status = true;
-        }
-
-        if(status === false){
-            return false;
-        }
-    }
-
     if(length !== undefined){
         status = false;
         if(Array.isArray(length) && length.length == 2){
@@ -143,6 +132,10 @@ module.exports = function({type, length, format, list, mime}, data){
             if(isValidDecimal(data)){
                 status = true;
             }
+        }else if(typeof format == 'function'){
+            status = format(data, (value)=>{
+                data = value;
+            }) === true;
         }
 
         if(status === false){
@@ -157,5 +150,5 @@ module.exports = function({type, length, format, list, mime}, data){
     }
         
 
-    return true;
+    return data;
 }

package/lib/server.js

@@ -483,9 +483,9 @@ module.exports = class{
                     for(let id in data){
                         let {t, r} = data[id];
                         if(req.body[id] !== undefined){
-                            let value = type == 'json' ? req.body[id] : req.q(id);
-                            let test = checkType(this.TYPE_TREE[t] || {}, value);
-                            if(!test){
+                            let raw = type == 'json' ? req.body[id] : req.q(id);
+                            let value = checkType(this.TYPE_TREE[t] || {}, raw);
+                            if(value === false){
                                 req.response.header.push(httpHeader.CONTENT_TYPE_JSON);
                                 req.code(400).http('{"status":false,"err":"Invalid format for parameter."}');
                                 return false;
@@ -660,15 +660,15 @@ module.exports = class{
         }
     }
 
-    type(id, {type, length, format, list, mime}){
-        this.TYPE_TREE[id] = {type, length, format, list, mime};
+    type(id, {type, length, format, list}){
+        this.TYPE_TREE[id] = {type, length, format, list};
         return this;
     }
     types(obj){
         for(let x in obj){
-            let {type, length, format, list, mime} = obj[x];
+            let {type, length, format, list} = obj[x];
 
-            this.TYPE_TREE[x] = {type, length, format, list, mime};
+            this.TYPE_TREE[x] = {type, length, format, list};
         }
         return this;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "upcore-tcp",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "description": "Upcore Web framework support http websocket",
   "keywords": [
     "upcore",