birdpack 1.0.13 → 1.0.15

package/lib/core.js

@@ -340,54 +340,41 @@ module.exports = class{
                 const totalSize = fileStat.size;
                 let match = (this.get('range') || '').slice(6).split('-');
 
-                this.set('accept-ranges', 'bytes')
-                .type(options.type);
+                const start = parseInt(match[0], 10) || 0;
+                const end = parseInt(match[1], 10) || totalSize - 1;
 
-                if(match.length == 2){
-                    const start = parseInt(match[0], 10) || 0;
-                    const end = parseInt(match[1], 10) || totalSize - 1;
+                const chunkSize = end - start + 1;
+                const fileDescriptor = fs.openSync(options.file, "r");
 
-                    const chunkSize = end - start + 1;
-                    const fileDescriptor = fs.openSync(options.file, "r");
-
-                    const sendChunk = (position) => {
-                        if(position > end){
-                            fs.closeSync(fileDescriptor);
-                            return;
-                        }
-
-                        const bytesToRead = Math.min(bufferSize, end - position + 1);
-                        const bytesRead = fs.readSync(fileDescriptor, buffer, 0, bytesToRead, position);
+                const sendChunk = (position) => {
+                    if(position > end){
+                        fs.closeSync(fileDescriptor);
+                        return;
+                    }
 
-                        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(206)
-                    .length(chunkSize)
-                    .set('content-range', `bytes ${start}-${end}/${totalSize}`)
-                    .writeHead();
-                    sendChunk(start);
-                }else{
-                    const start = 0;
-                    const end = totalSize - 1;
-                    const chunkSize = end - start + 1;
+                    const bytesToRead = Math.min(bufferSize, end - position + 1);
+                    const bytesRead = fs.readSync(fileDescriptor, buffer, 0, bytesToRead, position);
 
-                    this.code(200)
-                    .length(chunkSize)
-                    .set('content-range', `bytes ${start}-${end}/${totalSize}`)
-                    .writeHead();
-                    this.end();
-                }
+                    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(206)
+                .length(chunkSize)
+                .type(options.type)
+                .set('accept-ranges', 'bytes')
+                .set('content-range', `bytes ${start}-${end}/${totalSize}`)
+                .writeHead();
+                sendChunk(start);
             }else if(fileRange == 'file'){
                 if(options.parameter){
                     let data = fs.readFileSync(options.file, { encoding: 'utf8', flag: 'r' });

package/lib/method.js

@@ -28,7 +28,9 @@ const serviceMethod = {
         }
     },
     directory:(use)=>{
-        return (dir, {path, callback, error})=>{
+        return (dir, option)=>{
+            let {path, callback, error} = option || {};
+
             if(typeof path !== 'string'){
                 path = '/';
             }else if(path[path.length-1] != '/'){

package/lib/server.js

@@ -334,7 +334,12 @@ module.exports = class{
         return config;
     }
     set({domain, method, url, next, callback}){
-        if(typeof domain != 'string'){
+        if(Array.isArray(domain)){
+            for(let x of domain){
+                this.set({domain:x, method, url, next, callback});
+            }
+            return true;
+        }else if(typeof domain != 'string'){
             domain = '*';
         }
 
@@ -383,7 +388,12 @@ module.exports = class{
         }
     }
     setUpgrade({domain, next, url, callback}){
-        if(typeof domain != 'string'){
+        if(Array.isArray(domain)){
+            for(let x of domain){
+                this.set({domain:x, next, url, callback});
+            }
+            return true;
+        }else if(typeof domain != 'string'){
             domain = '*';
         }
 

package/lib/websocket.js

@@ -28,6 +28,8 @@ module.exports = class{
             })
             .on('close', () => {
                 this.userOut();
+                this.callOut();
+                this.callOut = ()=>{};
                 this.callback(this, 'close');
             })
             .on('error', (e) => {
@@ -226,7 +228,10 @@ module.exports = class{
             }
         });
     }
-    start(uid){
+    callOut(){
+
+    }
+    async start(uid){
         let seckey = this.get('sec-websocket-key');
         let protocol = this.get('sec-websocket-protocol');
         let version = parseInt(this.get('sec-websocket-version') || 0);
@@ -240,6 +245,11 @@ module.exports = class{
         if(checkUser !== false){
             checkUser.userOut();
             checkUser.stop();
+            await new Promise((resolve)=>{
+                checkUser.callOut = ()=>{
+                    resolve();
+                };
+            });
         }
         
         this.uid = uid;

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.13",
+    "version":"1.0.15",
     "main": "index.js"
 }