birdpack 1.0.7 → 1.0.9

package/lib/core.js

@@ -387,46 +387,72 @@ module.exports = class{
                     this.end();
                 }
             }else if(fileRange == 'file'){
-                const totalSize = fileStat.size;
-
-                const start = 0;
-                const end = totalSize - 1;
+                if(options.parameter){
+                    let data = fs.readFileSync(options.file, { encoding: 'utf8', flag: 'r' });
+
+                    data = data.replace(/\{\{[a-zA-Z0-9\_]*\}\}/g, (a)=>{
+                        let key = a.slice(2,-2);
+                        if(key != ''){
+                            if(options.parameter.hasOwnProperty(key)){
+                                return options.parameter[key]
+                            }
+                        }
+                        return '';
+                    });
 
-                const chunkSize = end - start + 1;
-                const fileDescriptor = fs.openSync(options.file, "r");
+                    data = Buffer.from(data, "utf8");
 
-                const sendChunk = (position) => {
-                    if(position > end){
-                        fs.closeSync(fileDescriptor);
-                        return;
+                    if(options.download === true){
+                        this.set('content-disposition', `attachment; filename="${options.filename}"`);
                     }
 
-                    const bytesToRead = Math.min(bufferSize, end - position + 1);
-                    const bytesRead = fs.readSync(fileDescriptor, buffer, 0, bytesToRead, position);
+                    this.code(200)
+                    .length(data.length)
+                    .type(options.type);
+                    
+                    this.send(data);
+                }else{
+                    const totalSize = fileStat.size;
 
-                    if(bytesRead > 0 && this.res.writable){
-                        this[position + bytesRead > end ? 'end' : 'write'](buffer.slice(0, bytesRead), (err) => {
-                            if (err) {
-                                fs.closeSync(fileDescriptor);
-                            } else {
-                                sendChunk(position + bytesRead);
-                            }
-                        });
-                    }else{
-                        fs.closeSync(fileDescriptor);
-                    }
-                };
+                    const start = 0;
+                    const end = totalSize - 1;
 
-                this.code(200)
-                .length(chunkSize)
-                .type(options.type);
+                    const chunkSize = end - start + 1;
+                    const fileDescriptor = fs.openSync(options.file, "r");
+
+                    const sendChunk = (position) => {
+                        if(position > end){
+                            fs.closeSync(fileDescriptor);
+                            return;
+                        }
 
-                if(options.download === true){
-                    this.set('content-disposition', `attachment; filename="${options.filename}"`);
+                        const bytesToRead = Math.min(bufferSize, end - position + 1);
+                        const bytesRead = fs.readSync(fileDescriptor, buffer, 0, bytesToRead, position);
+
+                        if(bytesRead > 0 && this.res.writable){
+                            this[position + bytesRead > end ? 'end' : 'write'](buffer.slice(0, bytesRead), (err) => {
+                                if (err) {
+                                    fs.closeSync(fileDescriptor);
+                                } else {
+                                    sendChunk(position + bytesRead);
+                                }
+                            });
+                        }else{
+                            fs.closeSync(fileDescriptor);
+                        }
+                    };
+
+                    this.code(200)
+                    .length(chunkSize)
+                    .type(options.type);
+
+                    if(options.download === true){
+                        this.set('content-disposition', `attachment; filename="${options.filename}"`);
+                    }
+                    
+                    this.writeHead();
+                    sendChunk(start);
                 }
-                
-                this.writeHead();
-                sendChunk(start);
             }else{
                 options.error(400, 'This file not supported.');
             }

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 = {
@@ -246,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();
 
@@ -383,3 +409,4 @@ 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.7",
+    "version":"1.0.9",
     "main": "index.js"
 }