gina 0.1.6-alpha.143 → 0.1.6-alpha.144

package/framework/{v0.1.6-alpha.143 → v0.1.6-alpha.144}/lib/domain/src/main.js

@@ -41,13 +41,20 @@ if ( typeof(module) !== 'undefined' && module.exports) {
  */
 function Domain(options, cb) {
 
+    this.name = arguments.callee.name;
+
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
     // Detect if user is on IE browser
     var isIE            = false;
     var defaultUrl      = "/_gina/assets/public_suffix_list.dat";
+    var customEvent     = null; // isGFFCtx only
+    var myEventBus      = null;
     if (isGFFCtx) {
         isIE = !!window.MSInputMethodContext && !!document.documentMode;
         defaultUrl = gina.config.webroot + defaultUrl.substring(1);
+        // Create a custom event
+        myEventBus = new EventTarget();
+
     }
 
     if ( typeof(arguments[0]) == 'function' ) {
@@ -79,12 +86,15 @@ function Domain(options, cb) {
     // cat ./framework/v0.1.6-alpha.83/core/asset/data/public_suffix_list.dat|grep 'COMMIT:'|sed 's/^\/\/ COMMIT\: //'
 
     var self = {
+        name    : this.name,
         options : null,
-        rawPSL  : null,
+        /**@js_externs rawPSL*/
+        rawPSL  : window['rawPSL'] || null,
         PSL     : [],
     };
 
     var init = function(proto, options, cb) {
+
         if ( typeof(options) == 'undefined' ) {
             options = defaultOptions
         } else {
@@ -102,12 +112,13 @@ function Domain(options, cb) {
 
         if (isGFFCtx && options.isCachingRequired ) {
             console.warn('[DOMAIN] `options.isCachingRequired` is only available for backend');
-            options.isCachingRequired = false
+            options.isCachingRequired = false;
         }
 
         self.options = options;
 
         if (cb) {
+
             return loadPSL(options, function onPSLLoaded(err) {
                 if (err) {
                     cb(err);
@@ -122,7 +133,9 @@ function Domain(options, cb) {
 
         // Assuming that you have previously initialized Domain
         loadPSL(options);
+
         console.debug('[DOMAIN] PSL Loaded');
+
         return proto
     }
 
@@ -132,6 +145,7 @@ function Domain(options, cb) {
     }
 
     var loadPSL = async function(opt, cb) {
+
         var filenameOrUrl   = (isGFFCtx || opt.isCachingRequired) ? opt.url : opt.filename;
         var isUpdating      = ( typeof(opt.isUpdating) != 'undefined' ) ? opt.isUpdating : false;
         var err             = null;
@@ -149,6 +163,24 @@ function Domain(options, cb) {
                 return;
             }
 
+            myEventBus.addEventListener('domain_psl.loaded', (event) => {
+                // console.log('Data loaded:', event.detail.data);
+                // console.log('Timestamp:', event.detail.timestamp);
+                cb(event.detail.error);
+            });
+
+
+            if ( window['gina']['_global']['initialized'].indexOf( self.name ) > -1 ) {
+                return;
+            }
+
+            if (
+                isGFFCtx
+                && window['gina']['_global']['initialized'].indexOf( self.name ) == -1
+            ) {
+                window['gina']['_global']['initialized'].push( self.name );
+            }
+
             var response = null
                 , result = null
             ;
@@ -156,17 +188,36 @@ function Domain(options, cb) {
                 response    = await fetch(filenameOrUrl);
                 result      = await response.text();
 
-                self.rawPSL = result;
+                self.rawPSL = window['rawPSL'] = result;
+
             } catch (PSLErr) {
                 // There was an error
                 // console.warn('[DOMAIN] Could not load PSL', err.stack || err.message || err);
                 err = new Error('[DOMAIN] Could not load PSL\n'+ (PSLErr.stack || PSLErr.message || PSLErr) );
-                cb(err);
+                // cb(err);
+                myEventBus.dispatchEvent(
+                    new CustomEvent('domain_psl.loaded', {
+                        detail: {
+                            data: null,
+                            error: err,
+                            timestamp: new Date()
+                        }
+                    })
+                );
                 return;
             }
 
             opt.isUpdating = false;
-            cb(false);
+            // cb(false);
+            myEventBus.dispatchEvent(
+                new CustomEvent('domain_psl.loaded', {
+                    detail: {
+                        data: result,
+                        error: false,
+                        timestamp: new Date()
+                    }
+                })
+            );
 
             return;
         }
@@ -198,12 +249,12 @@ function Domain(options, cb) {
             var cmd = 'curl -o '+opt.filename +' '+ opt.url +' >/dev/null 2>&1';
             console.debug('[DOMAIN] Running: '+ cmd);
             try {
-                execSync(cmd);
+                console.debug( execSync(cmd).toString() );
             } catch (err) {
                 console.warn('[DOMAIN] could not fetch from `'+ opt.url +'`. Trying with `'+ opt.alternativeUrl +'`');
                 cmd = 'curl -o '+opt.filename +' '+ opt.alternativeUrl +' >/dev/null 2>&1';
                 try {
-                    execSync(cmd);
+                   console.debug( execSync(cmd).toString() );
                 } catch (altErr) {
                     cb(altErr);
                     return;

package/framework/{v0.1.6-alpha.143 → v0.1.6-alpha.144}/lib/routing/src/main.js

@@ -23,8 +23,26 @@ function Routing() {
         notFound: {}
     };
 
+    self.getInstance = function(params) {
+        return Routing.instance;
+    }
+
+
+    if ( typeof(Routing.initialized) == 'undefined' ) {
+        Routing.initialized     = true;
+        Routing.instance        = self;
+        Routing._cached         = [];
+        Routing._cachedRoutes   = {};
+    } else {
+        self = self.getInstance();
+        return self;
+    }
+
+
     self.allowedMethodsString   = self.allowedMethods.join(',');
 
+
+
     // loading lib & plugins
     var plugins     = null
         , inherits  = null
@@ -131,6 +149,77 @@ function Routing() {
 
     // }
 
+    /**
+     * Cache route information to be retrieved later
+     *
+     * @param {string} routeId - e.g.: GET:/index
+     * @param {string} name - route name
+     * @param {object} routeObject - routing[name]
+     * @param {object} params - route params
+     * @param {object} methodParams - GET|PUT ...
+     */
+    self.cache = function(routeId, name, routeObject, params, methodParams) {
+        if ( Routing._cached.indexOf(routeId) == -1 ) {
+            Routing._cached.push(routeId);
+            Routing._cachedRoutes[routeId] = {
+                name            : name,
+                routing         : routeObject,
+                params          : params,
+                methodParams    : methodParams
+            };
+        }
+    }
+
+    /**
+     * Get cached route information to be retrieved later
+     *
+     * @param {string} routeId - e.g.: GET:/index
+     * @param {string} name - route name
+     * @param {object} routeObject - routing[name]
+     * @param {object} params - route params
+     */
+    self.getCached = function(routeId, req) {
+        if ( Routing._cached.indexOf(routeId) > -1 ) {
+
+            var cachedRoute = Routing._cachedRoutes[routeId];
+            var method      = req.method.toLowerCase();
+
+
+            // routeObject
+            var routeObject       = JSON.clone(cachedRoute.routing);
+            var params = {
+                method              : method,
+                requirements        : routeObject.requirements,
+                namespace           : routeObject.namespace || undefined,
+                url                 : decodeURI(req.url), /// avoid %20
+                rule                : routeObject.originalRule || cachedRoute.name,
+
+                param               : routeObject.param,
+
+                middleware          : routeObject.middleware,
+                bundle              : routeObject.bundle,
+                isXMLRequest        : req.isXMLRequest,
+                isWithCredentials   : req.isWithCredentials
+            };
+            if ( typeof(routeObject.rule) == 'undefined' && typeof(params.rule) != 'undefined' ) {
+                routeObject.rule = params.rule;
+            }
+
+            // isRoute
+            return self.compareUrls(params, routeObject.url, req);
+        }
+
+        return null
+    }
+
+    self.invalidateCached = function(routeId) {
+        if ( Routing._cached.indexOf(routeId) > -1 ) {
+            // routeObject
+            Routing._cached.splice( Routing._cached.indexOf(routeId), 1);
+            delete Routing._cachedRoutes[routeId];
+        }
+    }
+
     /**
      * Compare urls
      *
@@ -749,6 +838,14 @@ function Routing() {
     var replacement = function(matched){
         return ( /\/$/.test(matched) ? replacement.variable+ '/': replacement.variable )
     };
+
+    /**
+     * checkRouteParams
+     *
+     * @param {object} route
+     * @param {object} params
+     * @return {object} route - updated route object
+     */
     var checkRouteParams = function(route, params) {
         var variable        = null
             , regex         = null
@@ -759,6 +856,7 @@ function Routing() {
             , p             = null
             , pLen          = null
         ;
+
         for (p in route.param) {
             if ( typeof(params) != 'undefined' && typeof(params[p]) == 'undefined' ) continue;
 

package/framework/{v0.1.6-alpha.143 → v0.1.6-alpha.144}/lib/shell.js

@@ -1,9 +1,10 @@
-var fs = require('fs');
-var EventEmitter = require('events').EventEmitter;
-var spawn = require('child_process').spawn;
-var inherits = require(require.resolve('./inherits'));
-var helpers = require('./../helpers');
-var console = require('./logger');
+var fs              = require('fs');
+var EventEmitter    = require('events').EventEmitter;
+var spawn           = require('child_process').spawn;
+var execSync        = require('child_process').execSync;
+var inherits        = require(require.resolve('./inherits'));
+var helpers         = require('./../helpers');
+var console         = require('./logger');
 
 /**
  * SSH SHELL

package/package.json

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

package/framework/v0.1.6-alpha.143/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.143