birdpack 1.0.10 → 1.0.11

package/lib/method.js

@@ -64,7 +64,7 @@ module.exports = {
             return this;
         }
     },
-    websocket:(app, use, domain)=>{
+    websocket:(app, use, {domain, next})=>{
         return (url, a, b, c)=>{
             let typeA = typeof a == 'function';
             let typeB = typeof b == 'function';
@@ -95,7 +95,8 @@ module.exports = {
             };
 
             app.setUpgrade({
-                domain, 
+                domain,
+                next,
                 url, 
                 callback: app.setCall(callback)
             });

package/lib/server.js

@@ -87,7 +87,7 @@ module.exports = class{
         methodPlugin.basic(this, this, {domain:'*'});
         this.routes = methodPlugin.routes(this);
         this.directory = methodPlugin.directory(this);
-        this.websocket = methodPlugin.websocket(this, this, '*');
+        this.websocket = methodPlugin.websocket(this, this, {domain:'*'});
     }
     setupSSL(){
         if(this.opt.use !== 'https'){
@@ -236,13 +236,19 @@ module.exports = class{
             }
 
             if(call && call.hasOwnProperty(ws.path)){
-                call = call[ws.path].callback;
-                this.traffic(ws);
-                
-                const run = this.getCall(call);
-
-                ws.update(run);
-                run(ws, 'start');
+                call = call[ws.path];
+
+                if(call.next !== false){
+                    this.getCall(call.next)(ws, ()=>{
+                        const run = this.getCall(call.callback);
+                        ws.update(run);
+                        run(ws, 'start');
+                    });
+                }else{
+                    const run = this.getCall(call.callback);
+                    ws.update(run);
+                    run(ws, 'start');
+                }
             }else{
                 ws.error(404);
             }
@@ -317,6 +323,7 @@ module.exports = class{
                 methodPlugin.basic(this, next, {domain, next:this.setCall(n)});
                 next.routes = methodPlugin.routes(next);
                 next.directory = methodPlugin.directory(next);
+                next.websocket = methodPlugin.websocket(this, next, {domain, next:this.setCall(n)});
 
                 return next;
             }
@@ -324,7 +331,7 @@ module.exports = class{
         methodPlugin.basic(this, config, {domain});
         config.routes = methodPlugin.routes(config);
         config.directory = methodPlugin.directory(config);
-        config.websocket = methodPlugin.websocket(this, config, domain);
+        config.websocket = methodPlugin.websocket(this, config, {domain});
         
         return config;
     }
@@ -377,7 +384,7 @@ module.exports = class{
             this.maps[domain][method].params[mode == 'params' ? 0 : 1].push(route);
         }
     }
-    setUpgrade({domain, url, callback}){
+    setUpgrade({domain, next, url, callback}){
         if(typeof domain != 'string'){
             domain = '*';
         }
@@ -390,12 +397,17 @@ module.exports = class{
             return false;
         }
 
+        if(typeof next != 'number'){
+            next = false;
+        }
+
         if(!this.mapws.hasOwnProperty(domain)){
             this.mapws[domain] = {};
         }
 
         this.mapws[domain][url] = {
-            callback:callback
+            callback,
+            next,
         };
     }
     setCall(callback){
@@ -408,5 +420,14 @@ module.exports = class{
         }
         return ()=>{};
     }
+    next(n){
+        let next = {}; 
+        methodPlugin.basic(this, next, {domain:'*', next:this.setCall(n)});
+        next.routes = methodPlugin.routes(next);
+        next.directory = methodPlugin.directory(next);
+        next.websocket = methodPlugin.websocket(this, next, {domain:'*', next:this.setCall(n)});
+
+        return next;
+    }
 }
 

package/lib/websocket.js

@@ -11,6 +11,7 @@ module.exports = class{
     query = {}
     method = ''
     ip = ''
+    isUID = false
     callback = ()=>{}
     log = ()=>{}
     constructor({req, socket, head}){
@@ -170,6 +171,7 @@ module.exports = class{
         const head = tools.head2line(this.header);
         const statusLine = `HTTP/1.1 ${this.status} ${tools.statusText(this.status)}`;
         const headLine = `${statusLine}\r\n${head}\r\n\r\n`;
+        this.isUID = true;
         this.write(Buffer.from(headLine));
 
         this.log();
@@ -177,7 +179,9 @@ module.exports = class{
         return this;
     }
     write(data, callback){
-        if(this.socket.writable){
+        if(!this.isUID){
+            this.error(400);
+        }else if(this.socket.writable){
             this.socket.write(data, callback);
         }else if(this.req.destroyed){
             this.req.destroy();

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