gina 0.1.1-alpha.163 → 0.1.1-alpha.165

package/framework/{v0.1.1-alpha.163 → v0.1.1-alpha.165}/lib/cron/src/main.js

@@ -15,13 +15,13 @@ var fs      = require('fs');
 
 /**
  * Crons Collection
- * 
  *
- * @package     Freelancer.CoreAPI
+ *
+ * @package     Lib.Cron
  * @author      Rhinostone
  */
 function Cron(opt) {
-    
+
     // load context
     var cfg             = getConfig()
         , env           = cfg.env
@@ -33,7 +33,7 @@ function Cron(opt) {
      * @constructor
      * */
     var init = function(opt) {
-        
+
         // load crons
         var path        = bundleConfig.cronsPath
             , crons     = {}
@@ -128,7 +128,7 @@ function Cron(opt) {
                 interval = value * 1000;
         }
 
-       
+
         if (isRealInterval) {
 
             if (this.cronId) {
@@ -147,9 +147,9 @@ function Cron(opt) {
 
             interval = options.interval || interval;
             var values = interval.split(/\s+/);
-            
+
             if (typeof (values.length) == 'undefined' || values.length !== 5 ) {
-                console.error('[ cron ] [ '+ this.name +' ] Interval misconfiguration: cron canceled !');  
+                console.error('[ cron ] [ '+ this.name +' ] Interval misconfiguration: cron canceled !');
 
                 return false;
             }

package/framework/{v0.1.1-alpha.163 → v0.1.1-alpha.165}/lib/domain/src/main.js

@@ -10,6 +10,8 @@
 if ( typeof(module) !== 'undefined' && module.exports) {
     var fs              = require('fs');
     var execSync        = require('child_process').execSync;
+    var util            = require('util');
+    var promisify       = util.promisify;
     try {
         // With gina framework only
         var console         =  require('../../logger');
@@ -24,12 +26,17 @@ if ( typeof(module) !== 'undefined' && module.exports) {
  * See: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#browser_compatibility
  *
  * TODO - Write a cron to periodically check updates from `https://publicsuffix.org/`
- * TODO - Finalize MD module support
+ * TODO - Finalize AMD module support
  * TODO - Replace execSync of `curl` to a NodeJS based synchronous request
  *
- * @param {string} [options] - { filename: "./dist/public_suffix_list.dat" } `.dat` configuration filename
+ * @param {string} [options] - {
+ *          // `.dat` configuration filename
+ *          filename: "./dist/public_suffix_list.dat",
+ *          // trigger PSL update pulling
+ *          isUpdating: false
+ *      }
  */
-function Domain(options) {
+function Domain(options, cb) {
 
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
     // Detect if user is on IE browser
@@ -38,6 +45,11 @@ function Domain(options) {
         isIE = !!window.MSInputMethodContext && !!document.documentMode;
     }
 
+    if ( typeof(arguments[0]) == 'function' ) {
+        cb = arguments[0];
+        options = undefined;
+    }
+
     var defaultOptions  = {
         // if isGFFCtx, should be place in the public folder to be served by your own host
         // e.g.: "./public_suffix_list.dat" located under "/my-www-folder/"
@@ -45,7 +57,8 @@ function Domain(options) {
         url                 : "https://publicsuffix.org/list/public_suffix_list.dat",
         alternativeUrl      : "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat",
         // only available from backend calls
-        isCachingRrequired  : false
+        isCachingRrequired  : false,
+        isUpdating          : false
     }
 
     var self = {
@@ -55,7 +68,7 @@ function Domain(options) {
     };
 
 
-    var init = function(proto, options) {
+    var init = function(proto, options, cb) {
         if ( typeof(options) == 'undefined' ) {
             options = defaultOptions
         } else {
@@ -78,31 +91,47 @@ function Domain(options) {
 
         self.options = options;
 
-        loadPSL(options);
+        if (cb) {
+            return loadPSL(options, function onPSLLoaded(err) {
+                if (err) {
+                    cb(err);
+                    return
+                }
 
-        console.debug('[DOMAIN] PSL Loaded');
+                console.debug('[DOMAIN] PSL Loaded');
+                // return proto
+
+                cb(err, proto)
+            });
+        }
 
+        // Assuming that you have previously initialized Domain
+        loadPSL(options);
+        console.debug('[DOMAIN] PSL Loaded');
         return proto
     }
 
-    // TODO - for frontend calls
+    // TODO - for frontend calls only
     var onReady = function() {
 
     }
 
-    var loadPSL = async function(opt, isUpdating) {
-        var filenameOrUrl = (isGFFCtx || opt.isCachingRrequired) ? opt.url : opt.filename;
-        isUpdating = ( typeof(isUpdating) != 'undefined' ) ? isUpdating : false
+    var loadPSL = async function(opt, cb) {
+        var filenameOrUrl   = (isGFFCtx || opt.isCachingRrequired) ? opt.url : opt.filename;
+        var isUpdating      = ( typeof(opt.isUpdating) != 'undefined' ) ? opt.isUpdating : false;
+        var err             = null;
 
         if (isGFFCtx) {
 
             if (self.rawPSL && !isUpdating) {
+                cb(false);
                 return;
             }
 
             if (!window.fetch) {// just in case
-                console.error( new Error('[DOMAIN] Fetch API not supported'));
-                return
+                err = new Error('[DOMAIN] Fetch API not supported');
+                cb(err);
+                return;
             }
 
             var response = null
@@ -113,26 +142,88 @@ function Domain(options) {
                 result      = await response.text();
 
                 self.rawPSL = result;
-            } catch (err) {
+            } catch (PSLErr) {
                 // There was an error
-                console.warn('[DOMAIN] Could not load PSL', err.stack || err.message || err);
+                // 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);
+                return;
             }
+
+            opt.isUpdating = false;
+            cb(false);
+
             return;
         }
 
+        // file exists ?
+        var exists = false;
+        if ( typeof(fs.accessSync) != 'undefined' ) {
+            try {
+                fs.accessSync(opt.filename, fs.constants.F_OK);
+                exists = true;
+            } catch (err) {
+                exists = false;
+                // to handle symlinks
+                try {
+                    if ( fs.lstatSync(opt.filename).isSymbolicLink() ) {
+                        exists = true
+                    }
+                } catch (linkErr) {}
+            }
+        } else { // support for old version of nodejs
+            exists = fs.existsSync(opt.filename);
+        }
+
+        if (!exists) {
+            opt.isCachingRrequired = true;
+        }
+
         if (opt.isCachingRrequired) { // Fetch is only supported from NodeJS >= 18.0.0
             var cmd = 'curl -o '+opt.filename +' '+ opt.url +' >/dev/null 2>&1';
             console.debug('[DOMAIN] Running: '+ cmd);
             try {
                 execSync(cmd);
             } 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);
                 } catch (altErr) {
-                    throw err
+                    cb(altErr);
+                    return;
                 }
             }
+            // Waiting for the file to be written
+            var found = false;
+            nIntervId = setInterval(() => {
+                // Check for modules availability
+                if ( typeof(fs.accessSync) != 'undefined' ) {
+                    try {
+                        fs.accessSync(opt.filename, fs.constants.F_OK);
+                        found = true;
+                    } catch (err) {
+                        found = false;
+                        // to handle symlinks
+                        try {
+                            if ( fs.lstatSync(opt.filename).isSymbolicLink() ) {
+                                found = true
+                            }
+                        } catch (linkErr) {}
+                    }
+                } else { // support for old version of nodejs
+                    found = fs.existsSync(opt.filename);
+                }
+
+                if ( found ) {
+                    clearInterval(nIntervId);
+                    self.rawPSL = fs.readFileSync(opt.filename).toString();
+                    cb(false);
+
+                    return
+                }
+            }, 200);
+
 
             // TODO - Synchronize this instead of using CURL
             // var http = require('http');
@@ -174,13 +265,24 @@ function Domain(options) {
 
             // self.rawPSL = data.toString();
 
+
+
         }
 
-        self.rawPSL = fs.readFileSync(filenameOrUrl).toString();
+        // Just in case some one delete it once `Domain` has been inatialized
+        try {
+            self.rawPSL = fs.readFileSync(opt.filename).toString();
+            if (cb)
+                cb(false)
+        } catch (err) {
+            console.warn('[DOMAIN] could not read from `'+ opt.filename +'`');
+            loadPSL(options, cb)
+        }
     }
 
-    var updatePSL = function() {
-        loadPSL(self.options, true);
+    var updatePSL = function(cb) {
+        self.options.isUpdating = true;
+        loadPSL(self.options, cb);
     }
 
 
@@ -275,14 +377,15 @@ function Domain(options) {
         console.debug('[DOMAIN] isSLD: '+ isSLD, urlOrHostname, ' -> ', rootDomain);
         if ( /^true$/i.test(jsonFormat) ) {
             return {
-                rootDomain: rootDomain,
-                isSLD: isSLD,
+                value               : rootDomain,
+                isSLD               : isSLD,
                 isRegisteredTldOrSld: isRegisteredTldOrSld
             }
         }
         return rootDomain
     }
 
+    // Both backend & frontend
     var _proto = {
         getRootDomain   : getRootDomain
     };
@@ -316,10 +419,10 @@ function Domain(options) {
         // Wait for the polyfills to load and run the function.
         // TODO - add a setinterval to trigger `onFetchReady`event
         return setTimeout(() => {
-            return init(_proto, options)
+            return init(_proto, options, cb)
         }, 500);
     } else {
-        return init(_proto, options)
+        return init(_proto, options, cb)
     }
 
 

package/package.json

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

package/script/post_install.js

@@ -263,7 +263,7 @@ function PostInstall() {
 
         // to handle sync vs async to allow execution in order of declaration
         if (funct) {
-            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(-1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
         } else {
             process.exit(0);
         }

package/script/post_publish.js

@@ -93,7 +93,7 @@ function PostPublish() {
 
         // to handle sync vs async to allow execution in order of declaration
         if (funct) {
-            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(-1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
         } else {
             process.exit(0);
         }

package/script/pre_install.js

@@ -183,7 +183,7 @@ function PreInstall() {
 
         // to handle sync vs async to allow execution in order of declaration
         if (funct) {
-            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(-1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();');// jshint ignore:line
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();');// jshint ignore:line
         } else {
             process.exit(0);
         }

package/script/prepare_version.js

@@ -107,7 +107,7 @@ function PrepareVersion() {
 
         // to handle sync vs async to allow execution in order of declaration
         if (funct) {
-            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(-1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
+            eval('async function on'+functName+'(){ await promisify('+ funct + ')().catch(function(e){ console.error(e.toString()); process.exit(1);}).then(function(){ begin('+(i+1)+')});}; on'+functName+'();'); // jshint ignore:line
         } else {
             process.exit(0);
         }

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

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