birdpack 1.0.6 → 1.0.8

package/lib/server.js

@@ -37,6 +37,35 @@ module.exports = class{
         }else{
             this.log = ()=>{};
         }
+
+        let traffic = this.opt.traffic;
+        if(typeof traffic !== 'string'){
+            traffic = '$time $status $method $path $ip $head(user-agent)';
+        }
+
+        let useTraffic = traffic.replace(/\$[a-zA-Z0-9\(\)\-]*/g, (a)=>{
+            if(a == '$time'){
+                return '${time}';
+            }else if(a == '$status'){
+                return '${c.status}';
+            }else if(a == '$method'){
+                return '${c.method}';
+            }else if(a == '$path'){
+                return '${c.path}';
+            }else if(a == '$ip'){
+                return '${c.ip}';
+            }else if(a == '$body'){
+                return '${typeof c.body == "object" ? JSON.stringify(c.body) : (typeof c.body == "string" ? c.body : "NULL")}';
+            }else if(a.slice(0,5) == '$head'){
+                let myhead = a.slice(6,-1);
+                return '${c.get("' + myhead + '") || "NULL"}';
+            }
+        })
+
+        let callTraffic = new Function("time", "c", `return \`${useTraffic}\``);
+        this.traffic = (c)=>{
+            this.log('client', callTraffic(this.getFormattedDateTime(), c));
+        }
     }
     argv(){
         let cmd = {
@@ -236,8 +265,9 @@ module.exports = class{
             }
 
             this.logServer('server', `The server is collecting logs via (${this.opt.log})`);
-            this.server.listen(port || this.opt.port || process.env.PORT || 3000, host, ()=>{
-                this.logServer('server', `Started on server(${this.opt.use}) port(${this.server._connectionKey.split(':').pop()})`);
+            port = port || this.opt.port || process.env.PORT || 3000;
+            this.server.listen(port, host, ()=>{
+                this.logServer('server', `Started on server(${this.opt.use}) port(${port})`);
             });
         }
     }
@@ -245,9 +275,6 @@ module.exports = class{
         let out = `[${status}] - ${text}`;
         console.log(out);
     }
-    traffic(c){
-        this.log('client',`${this.getFormattedDateTime()} ${c.status} ${c.method} ${c.path} ${c.ip} ${c.get('user-agent')}`);
-    }
     getFormattedDateTime(){
         let now = new Date();
 
@@ -381,4 +408,5 @@ module.exports = class{
         }
         return ()=>{};
     }
-}
+}
+

package/package.json

@@ -3,6 +3,6 @@
     "description": "BirdPack web framework is a tool for web server via TCP HTTP supporting websocket focusing on speed.",
     "author":"R938",
     "license":"R938",
-    "version":"1.0.6",
+    "version":"1.0.8",
     "main": "index.js"
 }