gina 0.1.1-alpha.176 → 0.1.1-alpha.178

package/framework/{v0.1.1-alpha.176 → v0.1.1-alpha.178}/core/server.isaac.js

@@ -12,8 +12,9 @@ const inherits          = lib.inherits;
 const merge             = lib.merge;
 const console           = lib.logger;
 
-const env     = process.env.NODE_ENV
-    , isDev = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false;
+const env       = process.env.NODE_ENV
+    , isDev     = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+;
 
 var refreshCore = function() {
 
@@ -31,12 +32,12 @@ var refreshCore = function() {
         }
     }
 
-    //update lib & helpers
+    // Update lib & helpers
     delete require.cache[require.resolve(_(libPath +'/index.js', true))];
     require.cache[_(libPath +'/index.js', true)] = require( _(libPath +'/index.js', true) );
     require.cache[_(corePath + '/gna.js', true)].exports.lib = require.cache[_(libPath +'/index.js', true)];
 
-    //update plugins
+    // Update plugins
     delete require.cache[require.resolve(_(corePath +'/plugins/index.js', true))];
     require.cache[_(corePath +'/plugins/index.js', true)] = require( _(corePath +'/plugins/index.js', true) );
     require.cache[_(corePath + '/gna.js', true)].exports.plugins = require.cache[_(corePath +'/plugins/index.js', true)];
@@ -142,90 +143,6 @@ function ServerEngineClass(options) {
         // }
     }
 
-    if ( typeof(options.ioServer) != 'undefined' && typeof(options.ioServer.integrationMode) != 'undefined' && /^attach$/.test(options.ioServer.integrationMode) ) {
-        console.info('[IO SERVER ] `eio` found using `'+ options.ioServer.integrationMode +'` integration mode');
-        delete options.ioServer.integrationMode;
-        // test done in case we would like to switch to socket.io-server
-        ioServer = ( typeof(Eio.attach) != 'undefined' ) ? new Eio.attach(server, options.ioServer) : new Eio(server, options.ioServer);
-
-        ioServer.getClientsBySessionId = function(sessionId) {
-
-            if (this.clients.count() == 0)
-                return null;
-
-            var clients = null;
-
-            for (var id in this.clients) {
-
-                if ( typeof(this.clients[id].sessionId) == 'undefined' )
-                    continue;
-
-                if (!clients) clients = {};
-
-                clients[id] = this.clients[id];
-            }
-
-            if (clients) {
-                // allowing to send for each client found sharing the same request session
-                clients.send = function(payload, option, callback) {
-                    for ( var id in this) {
-                        if ( typeof(this[id].sessionId) == 'undefined')
-                            continue;
-
-                        this[id].send(payload, option, callback)
-                    }
-                }
-            }
-
-
-            return clients;
-        }
-
-        server.eio = ioServer;
-
-        ioServer.on('connection', function (socket) {
-
-            socket.send(JSON.stringify({
-                id: this.id,//socket.id,
-                handshake: 'Welcomed to `'+ options.bundle +'` main socket !',
-                // how many ms before sending a new ping packet
-                pingTimeout: options.ioServer.pingTimeout || options.ioServer.timeout,
-                // how many ms without a pong packet to consider the connection closed
-                pingInterval: options.ioServer.pingInterval || options.ioServer.interval
-            }));
-
-            socket.on('message', function(payload){
-
-                try {
-                    console.debug('[IO SERVER ] receiving '+ payload);
-                    payload = JSON.parse(payload);
-                    // bind to session ID
-                    if ( typeof(payload.session) != 'undefined' ) {
-                        this.sessionId = payload.session.id;
-                    }
-                } catch(err) {
-                    console.error(err.stack||err.message|| err)
-                }
-
-            });
-
-            socket.on('close', function(){
-                console.debug('[IO SERVER ] closed socket #'+ this.id);
-            });
-        });
-
-        server.on('upgrade', function(req, socket, head){
-            console.debug('[IO SERVER ] upgrading socket #'+ this.id);
-            ioServer.handleUpgrade(req, socket, head);
-        });
-        // httpServer.on('request', function(req, res){
-        //     ioServer.handleRequest(req, res);
-        // });
-
-
-    }
-
-
 
     const onPath = function(path, cb, allowAll) {
 
@@ -300,7 +217,7 @@ function ServerEngineClass(options) {
                                     a[0] = decodeURIComponent(a[0])
                                 }
 
-                                request.query = JSON.parse(a[0]);
+                                request.query = a[0] ? JSON.parse(a[0]) : {};
                             } catch(err) {
                                 console.error(err.stack)
                             }
@@ -369,20 +286,99 @@ function ServerEngineClass(options) {
     }
 
 
-
-
     server.on('error', (err) => {
         console.error(err)
     });
 
-    // server.on('stream', (stream, headers) => {
-    //     // stream is a Duplex
-    //     stream.respond({
-    //         'content-type': 'text/html',
-    //         ':status': 200
-    //     });
-    //     stream.end('<h1>Hello World</h1>');
-    // });
+
+    //------------------------------------
+    // Engine IO server
+    //------------------------------------
+    if (
+        typeof(options.ioServer) != 'undefined'
+        && typeof(options.ioServer.integrationMode) != 'undefined'
+        && /^attach$/.test(options.ioServer.integrationMode)
+    ) {
+        console.info('[IO SERVER ] `eio` found using `'+ options.ioServer.integrationMode +'` integration mode');
+        delete options.ioServer.integrationMode;
+        // test done in case we would like to switch to socket.io-server
+        ioServer = ( typeof(Eio.attach) != 'undefined' ) ? new Eio.attach(server, options.ioServer) : new Eio(server, options.ioServer);
+
+        ioServer.getClientsBySessionId = function(sessionId) {
+
+            if (this.clients.count() == 0)
+                return null;
+
+            var clients = null;
+
+            for (var id in this.clients) {
+
+                if ( typeof(this.clients[id].sessionId) == 'undefined' )
+                    continue;
+
+                if (!clients) clients = {};
+
+                clients[id] = this.clients[id];
+            }
+
+            if (clients) {
+                // allowing to send for each client found sharing the same request session
+                clients.send = function(payload, option, callback) {
+                    for ( var id in this) {
+                        if ( typeof(this[id].sessionId) == 'undefined')
+                            continue;
+
+                        this[id].send(payload, option, callback)
+                    }
+                }
+            }
+
+
+            return clients;
+        }
+
+        server.eio = ioServer;
+
+        ioServer.on('connection', function (socket) {
+
+            socket.send(JSON.stringify({
+                id: this.id,//socket.id,
+                handshake: 'Welcomed to `'+ options.bundle +'` main socket !',
+                // how many ms before sending a new ping packet
+                pingTimeout: options.ioServer.pingTimeout || options.ioServer.timeout,
+                // how many ms without a pong packet to consider the connection closed
+                pingInterval: options.ioServer.pingInterval || options.ioServer.interval
+            }));
+
+            socket.on('message', function(payload){
+
+                try {
+                    console.debug('[IO SERVER ] receiving '+ payload);
+                    payload = JSON.parse(payload);
+                    // bind to session ID
+                    if ( typeof(payload.session) != 'undefined' ) {
+                        this.sessionId = payload.session.id;
+                    }
+                } catch(err) {
+                    console.error(err.stack||err.message|| err)
+                }
+            });
+
+            socket.on('close', function(){
+                console.debug('[IO SERVER ] closed socket #'+ this.id);
+            });
+        });
+
+        server.on('upgrade', function(req, socket, head){
+            console.debug('[IO SERVER ] upgrading socket #'+ this.id);
+            ioServer.handleUpgrade(req, socket, head);
+        });
+        // httpServer.on('request', function(req, res){
+        //     ioServer.handleRequest(req, res);
+        // });
+
+
+    }
 
 
 

package/framework/{v0.1.1-alpha.176 → v0.1.1-alpha.178}/core/server.js

@@ -1267,7 +1267,11 @@ function Server(options) {
         var url = (isWebroot) ? this._referrer : headers[':path'];
 
         var hanlersPath     = conf.handlersPath
-            , isHandler     = ( new RegExp('^'+ hanlersPath).test(assets[ url ].filename) ) ? true: false
+            , isHandler     = (
+                                typeof(assets[ url ]) != 'undefined'
+                                && typeof(assets[ url ].filename) != 'undefined'
+                                && new RegExp('^'+ hanlersPath).test(assets[ url ].filename)
+                            ) ? true: false
         ;
 
         if (!stream.pushAllowed) {
@@ -1445,8 +1449,9 @@ function Server(options) {
                     header = merge(header, responseHeaders);
                 }
                 header = completeHeaders(header, local.request, response);
+                var pushedFile = (/index.html$/.test(headers[':path']) && /\/$/.test(asset.filename) ) ? asset.filename +'index.html': asset.filename;
                 pushStream.respondWithFile(
-                    asset.filename
+                    pushedFile
                     , header
                     //, { onError }
                 );
@@ -1619,7 +1624,7 @@ function Server(options) {
                         isHandler   = false;
 
                         try {
-                            contentType = getHead(response, filename);
+                            contentType = getContentTypeByFilename(filename);
 
                             // adding gina loader
                             if ( /text\/html/i.test(contentType) && self.isCacheless() ) {
@@ -1728,7 +1733,7 @@ function Server(options) {
                                                 }
                                             }
 
-                                            contentType = getHead(response, filename);
+                                            contentType = getContentTypeByFilename(filename);
                                             contentType = contentType +'; charset='+ bundleConf.encoding;
                                             ext = request.url.match(/\.([A-Za-z0-9]+)$/);
                                             request.url = ( ext != null && typeof(ext[0]) != 'undefined' ) ? request.url : request.url + 'index.html';
@@ -2590,21 +2595,21 @@ function Server(options) {
         })
     }
 
-    var getHead = function(response, file) {
+    var getContentTypeByFilename = function(filename) {
         try {
-            var s       = file.split(/\./);
+            var s       = filename.split(/\./);
             var ext     = s[s.length-1];
             var type    = null;
             var mime    = self.conf[self.appName][self.env].server.coreConfiguration.mime;
 
-            if( typeof(mime[ext]) != 'undefined' ) {
+            if ( typeof(mime[ext]) != 'undefined' ) {
                 type = mime[ext];
             } else {
-                console.warn('[ '+file+' ] extension: `'+s[2]+'` not supported by gina: `core/mime.types`. Replacing with `plain/text` ')
+                console.warn('[ '+filename+' ] extension: `'+s[2]+'` not supported by gina: `core/mime.types`. Pathname must be a directory. Replacing with `plain/text` ')
             }
             return type || 'plain/text'
         } catch (err) {
-            console.error('Error while trying to getHead('+ file +') extention. Replacing with `plain/text` '+ err.stack);
+            console.error('Error while trying to getContentTypeByFilename('+ filename +') extention. Replacing with `plain/text` '+ err.stack);
             return 'plain/text'
         }
 

package/framework/{v0.1.1-alpha.176 → v0.1.1-alpha.178}/core/template/conf/statics.json

@@ -4,7 +4,7 @@
   "html": "{templatesPath}/html",  // used for templating
   "sass": "{templatesPath}/sass",  // used for templating
   "handlers": "{handlersPath}",  // used for templating
-  //"common": "{sharedPath}",
+// TODO - what if the user add "js/vendor" ? Do we override of merge ?
   "css/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/css",
   "js/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/js",
   // for plain html or public access