gina 0.1.1-alpha.186 → 0.1.1-alpha.187

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.187}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.186/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.187/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.186/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.187/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.186 → v0.1.1-alpha.187}/core/server.js

@@ -1147,25 +1147,57 @@ function Server(options) {
             re = new RegExp(authority);
             allowedOrigin = ( typeof(conf.server.response.header['access-control-allow-origin']) != 'undefined' && conf.server.response.header['access-control-allow-origin'] != '' ) ? conf.server.response.header['access-control-allow-origin'] : authority;
             var found = null, origin = null, origins = null; // to handles multiple origins
+            // var originHostReplacement = function(name) {
+            //     name = name.replace(/\{|\}/g, '');
+            //     name = name.split(/\@/);
+            //     var bundle      = name[0]
+            //         , project   = name[1]
+            //         , arr       = null
+            //         , domain    = null
+            //     ;
+            //     var env     = conf.env; // current env by default
+            //     if ( /\//.test(name[1]) ) {
+            //         arr     = name[1].split(/\//);
+            //         project = arr[0];
+            //         env     = (arr[1]) ? arr[1] : env;
+            //     }
+
+            //     domain      = ( !/^http/.test(self.conf[bundle][env].hostname) || /^\/\//.test(self.conf[bundle][env].hostname) ) ? scheme +'://'+ self.conf[bundle][env].hostname.replace(/^\/\//, '') : self.conf[bundle][env].hostname;
+            //     // sameOrigin  = (domain == self.conf[bundle][env].hostname) ? self.conf[bundle][env].hostname : false;
+
+            //     return domain
+            // }
+
             var originHostReplacement = function(name) {
-                name = name.replace(/\{|\}/g, '');
-                name = name.split(/\@/);
-                var bundle      = name[0]
-                    , project   = name[1]
-                    , arr       = null
-                    , domain    = null
-                ;
-                var env     = conf.env; // current env by default
-                if ( /\//.test(name[1]) ) {
-                    arr     = name[1].split(/\//);
-                    project = arr[0];
-                    env     = (arr[1]) ? arr[1] : env;
+                var matched = name.match(/{([-_A-z]+?@[-_A-z]+?)}/g);
+                if (!matched || !Array.isArray(matched) || Array.isArray(matched) && matched.length == 0 ) {
+                    return name
                 }
+                var env = self.conf.env;
+
+                for (let i=0, len=matched.length; i<len; ++i) {
+                    let oldHost = matched[i];
+                    let newHost = matched[i].replace(/\{|\}|\s+/g, '');
+                    newHost = newHost.split(/\@/);
+                    let bundle      = newHost[0]
+                        , project   = newHost[1]
+                        , arr       = null
+                        , hostname  = null
+                        , scheme    = null
+                    ;
+                    if ( /\//.test(newHost[1]) ) {
+                        arr     = newHost[1].split(/\//);
+                        project = arr[0];
+                        env     = (arr[1]) ? arr[1] : env;
+                    }
+                    scheme  = self.conf[bundle][env].server.scheme;
+                    hostname  = ( !self.conf[bundle][env].hostname ) ? self.conf[bundle][env].server.scheme + '://' + self.conf[bundle][env].host + ':' + self.conf[bundle][env].server.port : self.conf[bundle][env].hostname;
+                    name    = name.replace(oldHost, hostname);
+                }
+                matched = null;
+                env = null;
 
-                domain      = ( !/^http/.test(self.conf[bundle][env].hostname) || /^\/\//.test(self.conf[bundle][env].hostname) ) ? scheme +'://'+ self.conf[bundle][env].hostname.replace(/^\/\//, '') : self.conf[bundle][env].hostname;
-                sameOrigin  = (domain == self.conf[bundle][env].hostname) ? self.conf[bundle][env].hostname : false;
-
-                return domain
+                return name;
             }
 
             var headerValue = null, re = new RegExp('\{\s*(.*)\s*\}', 'g');
@@ -1179,7 +1211,6 @@ function Server(options) {
                             origin = sameOrigin
                         } else {
                             if ( /\,/.test(allowedOrigin) ) {
-                                // origins = allowedOrigin.replace(/\s+/g, '').replace(/([a-z0-9_-]+\@[a-z0-9_-]+|[a-z0-9_-]+\@[a-z0-9_-]+\/[a-z0-9_-]+\@[a-z0-9_-]+)/ig, originHostReplacement).split(/\,/g);
                                 origins = allowedOrigin.replace(/\s+/g, '').replace(re, originHostReplacement).split(/\,/g);
 
                                 found = ( origins.indexOf(authority) > -1 ) ? origins[origins.indexOf(authority)] : false;
@@ -1187,7 +1218,6 @@ function Server(options) {
                                     origin = found
                                 }
                             } else {
-                                // origin = allowedOrigin.replace(/\s+/g, '').replace(/([a-z0-9_-]+\@[a-z0-9_-]+|[a-z0-9_-]+\@[a-z0-9_-]+\/[a-z0-9_-]+\@[a-z0-9_-]+)/ig, originHostReplacement);
                                 origin = allowedOrigin.replace(/\s+/g, '').replace(re, originHostReplacement);
                             }
                         }
@@ -1566,7 +1596,7 @@ function Server(options) {
                                 header['pragma'] = 'no-cache';
                                 header['expires'] = '0';
                             }
-                            request = checkPreflightRequest(request);
+                            request = checkPreflightRequest(request, response);
                             header  = completeHeaders(header, request, response);
 
                             if (!stream.destroyed) {
@@ -1576,7 +1606,7 @@ function Server(options) {
 
                         } else {
                             response.setHeader('location', request.url);
-                            request = checkPreflightRequest(request);
+                            request = checkPreflightRequest(request, response);
                             completeHeaders(null, request, response);
                             if (cacheless) {
                                 response.writeHead(301, {
@@ -1889,21 +1919,23 @@ function Server(options) {
              * */
             request.isWithCredentials  = ( request.headers['access-control-allow-credentials'] && request.headers['access-control-allow-credentials'] == true ) ? true : false;
             /**
-             * Intercept gina headers
+             * Intercept gina headers for:
+             *  - form valdiation
+             *  - form security
              */
-            if ( typeof(request.headers['x-gina-form-id']) != 'undefined' ) {
-                var ginaHeaders = {
-                    form: {
-                        id: request.headers['x-gina-form-id']
-                    }
-                };
-                if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
-                    var rule = request.headers['x-gina-form-rule'].split(/\@/);
-                    ginaHeaders.form.rule = rule[0];
-                    ginaHeaders.form.bundle = rule[1];
-                }
-                request.ginaHeaders = ginaHeaders;
+            var ginaHeaders = {
+                form: {}
+            };
+            // if (/x\-gina\-form\-id/i.test(request.headers['access-control-request-headers']) ) {
+            if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
+                ginaHeaders.form.id = request.headers['x-gina-form-id'];
+            }
+            if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
+                var rule = request.headers['x-gina-form-rule'].split(/\@/);
+                ginaHeaders.form.rule = rule[0];
+                ginaHeaders.form.bundle = rule[1];
             }
+            request.ginaHeaders = ginaHeaders;
 
             local.request = request;
 
@@ -1990,8 +2022,6 @@ function Server(options) {
             if (
                 staticProps.isStaticFilename && staticsArr.indexOf(request.url) > -1
                 || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substr(request.url.lastIndexOf('/')+1), '') ) > -1
-                //|| staticProps.isStaticFilename && staticsArr.indexOf(staticProps.firstLevel) > -1
-                // take ^/dir/sub/*
                 || staticProps.isStaticFilename && new RegExp('^'+ staticProps.firstLevel).test(request.url)
                 || /\/$/.test(request.url) && !isWebrootHandledByRouting && !/\/engine\.io\//.test(request.url)
             ) {
@@ -2005,7 +2035,7 @@ function Server(options) {
                     'method': 'GET',
                     'bundle' : self.appName
                 };
-                request = checkPreflightRequest(request);
+                request = checkPreflightRequest(request, response);
                 local.request = request; // update request
                 // filtered to handle only html for now
                 if ( /text\/html/.test(request.headers['accept'])
@@ -2083,6 +2113,8 @@ function Server(options) {
                      *  - https://developers.google.com/web/updates/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
                      *  - https://jsperf.com/arraybuffer-string-conversion/4
                      *
+                     * TODO - Test with audio content
+                     *
                      * @param {string} str
                      *
                      * @returns {array} buffer
@@ -2729,7 +2761,7 @@ function Server(options) {
         });
     };
 
-    var checkPreflightRequest = function(request) {
+    var checkPreflightRequest = function(request, response) {
         var config = self.conf[self.appName][self.env];
         // by default, if not set in `${projectPath}/env.json`
         var corsMethod = 'GET, POST, HEAD';
@@ -2773,7 +2805,7 @@ function Server(options) {
             } else {
                 request.method = method
             }
-            accessControlRequestHeaders = ( typeof(request.headers['access-control-request-headers']) != 'undefined' ) ? request.headers['access-control-request-headers'] : '';
+            accessControlRequestHeaders = ( typeof(request.headers['access-control-request-headers']) != 'undefined' ) ? request.headers['access-control-request-headers'].replace(/\s+/, '').split(/\,/g) : '';
             if ( typeof(request.headers['access-control-request-credentials']) != 'undefined' && typeof(serverResponseHeaders['access-control-allow-credentials']) != 'undefined' ) {
                 request.isWithCredentials = true;
             }
@@ -2783,6 +2815,7 @@ function Server(options) {
                         request.isXMLRequest = true;
                     }
                 }
+                response.setHeader('access-control-allow-headers', request.headers['access-control-request-headers']);
             }
         }
 
@@ -2801,7 +2834,7 @@ function Server(options) {
 
         //matched = routingLib.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
 
-        req = checkPreflightRequest(req);
+        req = checkPreflightRequest(req, res);
         var params      = {}
             , _routing  = {}
             , method    = ( /http\/2/.test(self.conf[self.appName][self.env].server.protocol) ) ? req.headers[':method'] : req.method
@@ -2987,7 +3020,7 @@ function Server(options) {
 
         if (!res.headersSent) {
             // res.headersSent = true;
-            local.request = checkPreflightRequest(local.request);
+            local.request = checkPreflightRequest(local.request, local.response);
             // updated filter on controller.js : 2020/09/25
             //if (isXMLRequest || !withViews || !isUsingTemplate ) {
             if (isXMLRequest || !withViews || !isUsingTemplate || withViews && !isUsingTemplate ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.186",
+  "version": "0.1.1-alpha.187",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.186/core/gna",
+  "main": "./framework/v0.1.1-alpha.187/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/framework/v0.1.1-alpha.186/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.186