gina 0.1.1-alpha.161 → 0.1.1-alpha.163

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/core/server.js

@@ -227,8 +227,10 @@ function Server(options) {
                 })
             });
         } catch (err) {
-            console.emerg(sslDetails +'\n'+ err.stack);
-            return;
+            if (!sslDetails) {
+                throw new Error('DNS issue ? Did you check your `/etc/hosts` or your DNS configuration ?\n'+ err.stack);
+            }
+            throw new Error(sslDetails +'\n'+ err.stack);
         }
 
 
@@ -249,31 +251,30 @@ function Server(options) {
         //     ]
         // }
 
-        // const isHandleByWildcardCert = function(endpoint, hv) {
-        //     var isAllowed = false;
-        //     const start = new Date(hv.validFrom).format('longIsoDateTime');
-        //     const end = new Date(hv.validTo).format('longIsoDateTime');
-        //     const today = new Date().format('longIsoDateTime');
-        //     const allowed = hv.validFor;
-
-        //     for (let i=0, len=allowed.length; i<len; ++i ) {
-        //         // skip if not a wildcard
-        //         if ( ! /^[*]\./.test(allowed[i]) ) continue;
-
-        //         let re = new RegExp( allowed[i].replace(/^[*]/, '')+'$' );
-        //         if ( ! re.test(endpoint) ) continue;
-
-        //         if ( today >= start && today < end) {
-        //             isAllowed = true;
-        //             break
-        //         }
-        //     }
-        //     return isAllowed;
-        // }
+        const isHandleByWildcardCert = function(endpoint, hv) {
+            var isAllowed = false;
+            const start = new Date(hv.validFrom).format('longIsoDateTime');
+            const end = new Date(hv.validTo).format('longIsoDateTime');
+            const today = new Date().format('longIsoDateTime');
+            const allowed = hv.validFor;
 
-        // if ( failed && Array.isArray(sslDetails.validFor) && isHandleByWildcardCert(endpoint, sslDetails) ) {
-        //     return;
-        // }
+            for (let i=0, len=allowed.length; i<len; ++i ) {
+                // skip if not a wildcard
+                if ( ! /^[*]\./.test(allowed[i]) ) continue;
+
+                let re = new RegExp( allowed[i].replace(/^[*]/, '')+'$' );
+                if ( ! re.test(endpoint) ) continue;
+
+                if ( today >= start && today < end) {
+                    isAllowed = true;
+                    break
+                }
+            }
+            return isAllowed;
+        }
+        if ( failed && Array.isArray(sslDetails.validFor) && isHandleByWildcardCert(endpoint, sslDetails) ) {
+            return;
+        }
 
 
         if (failed) {
@@ -2197,7 +2198,6 @@ function Server(options) {
 
         });//EO this.instance
 
-
         self.instance.listen(self.conf[self.appName][self.env].server.port);//By Default 3100
         self.instance.timeout = (1000 * 300); // e.g.: 1000x60 => 60 sec
 
@@ -2473,7 +2473,7 @@ function Server(options) {
             } else {
                 console.warn('[ '+file+' ] extension: `'+s[2]+'` not supported by gina: `core/mime.types`. Replacing with `plain/text` ')
             }
-            return type || 'plain/text'
+            return type || 'plain/text'
         } catch (err) {
             console.error('Error while trying to getHead('+ file +') extention. Replacing with `plain/text` '+ err.stack);
             return 'plain/text'

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/core/template/boilerplate/bundle/config/settings.server.json

@@ -6,19 +6,19 @@
     * Default is `true`: set to false if you have describe a redirection rule from your `routing.json`
     */
     // "webrootAutoredirect": false,
-    
+
     /**
     * `template` settings
     * Default is `false`: will automatically be set to `true` when you add a view/template (`false` is right for APIs only)
     */
-    // "template": false 
-    
+    // "template": false,
+
     /**
     * `response` settings
     * This section is mostly used to setup CORS
     */
     // "response": {
-            // CORS settings sample
+    //        // CORS settings sample
     //     "header": {
     //         "access-control-allow-origin": "{bundle}@{project}, https://checkout.stripe.com",
     //         "access-control-allow-headers": "X-Requested-With", // To allow AJAX request

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/core/template/conf/env.json

@@ -15,7 +15,18 @@
   "logsPath": "{executionPath}/logs",
   "{bundle}": {
     "{env}": {
+      // This this the Root Domain
+      // Not to be confuse with the FQDN (host/hostname)
+      // Will take by default :
+      //  - the root domain extracted from your system hostname
+      //  - the `rootDomain` defined in your project/manifest.json
+      //  - the `rootDomain` defined in your project/env.json
+      //  - the `rootDomain` defined in your bundle/config/settings.server.json
+      // Since overrides are possible, last defined value will be the one taken in consideration by gina
+      "rootDomain": "",
       "projectPath": "{executionPath}",
+      "projectVersion": "",
+      "projectVersionMajor": "",
       "bundlesPath": "{executionPath}/bundles",
       "bundlePath": "{bundlesPath}/{bundle}",
       "sharedPath": "{executionPath}/shared",

package/framework/v0.1.1-alpha.163/helpers/json/LICENSE

@@ -0,0 +1,9 @@
+License (MIT)
+
+Copyright © 2023 Martin-Luther ETOUMAN <martin-luther.etouman@gina.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/helpers/json/package.json

@@ -5,7 +5,7 @@
 
   "author": {
     "name": "Maritn-Luther ETOUMAN",
-    "email": "martinluther@gina.io"
+    "email": "martin-luther@gina.io"
   },
   "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/helpers/json/src/main.js

@@ -9,7 +9,7 @@
  var fs = require('fs');
  var console = require('./../../../lib/logger');
 /**
- * TextHelper
+ * JSONHelper
  *
  * @package     Gina.Utils.Helpers
  * @author      Rhinostone <contact@gina.io>

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/helpers/plugins/package.json

@@ -5,7 +5,7 @@
 
   "author": {
     "name": "Maritn-Luther ETOUMAN",
-    "email": "martinluther@gina.io"
+    "email": "martin-luther@gina.io"
   },
   "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/helpers/prototypes.js

@@ -76,10 +76,19 @@ function PrototypesHelper(instance) {
     }
 
     if ( typeof(JSON.clone) == 'undefined' && !isGFFCtx ) {
-        if ( typeof(envVars) != 'undefined' ) {
+        if ( typeof(envVars) != 'undefined' && envVars != null ) {
             JSON.clone = require( envVars.GINA_DIR +'/utils/prototypes.json_clone');
         } else {
-            JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
+            // For unit tests
+            if (!envVars) {
+                var ginaDir = process.cwd().match(/.*\/gina/)[0];
+                require(ginaDir +'/utils/helper');
+                setEnvVar('GINA_DIR', ginaDir, true);
+                envVars = getEnvVars();
+            }
+
+            // JSON.clone = require( GINA_DIR +'/utils/prototypes.json_clone');
+            JSON.clone = require( getEnvVar('GINA_DIR') +'/utils/prototypes.json_clone');
         }
     }
 

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/lib/cmd/bundle/start.js

@@ -70,13 +70,19 @@ function Start(opt, cmd) {
             return cb(false);
         }
 
+        var gnaPath    =  _(projectObj.path +'/.gna', true);
+        var gnaPathObj  =  new _(gnaPath, true);
+        if ( ! gnaPathObj.existsSync() ) {
+            gnaPathObj.mkdirSync()
+        }
 
         var isNodeModulesReinstallNeeded = false;
         var nodeModulesPathObj = new _(projectObj.path +'/node_modules', true);
 
-        var projectArchFileObj = new _(projectObj.path +'/.gna/arch', true);
+
+        var projectArchFileObj = new _(gnaPath +'/arch', true);
         var projectArchFile = projectArchFileObj.toString();
-        var projectPlatformFileObj = new _(projectObj.path +'/.gna/platform', true);
+        var projectPlatformFileObj = new _(gnaPath +'/platform', true);
         var projectPlatformFile = projectPlatformFileObj.toString();
         var nodeModulesContentArr = ( nodeModulesPathObj.existsSync() ) ? fs.readdirSync(nodeModulesPathObj.toString()) : [];
         var newNodeModulesContentArr = [], n = 0;
@@ -249,6 +255,7 @@ function Start(opt, cmd) {
         ;
 
         isRealApp(bundle, function(err, appPath){
+
             if (err) {
                 terminal.error(err.stack||err.message)
             } else {

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/lib/cmd/env/list.js

@@ -10,6 +10,7 @@ function List(opt, cmd){
     var init = function(){
 
         self.projects = require(_(GINA_HOMEDIR + '/projects.json'));
+        var err = null;
 
         if ( typeof(process.argv[3]) != 'undefined') {
             if (process.argv[3] === '--all') {
@@ -32,8 +33,8 @@ function List(opt, cmd){
         } else if ( typeof(self.name) != 'undefined' && isDefined(self.name) ) {
             listProjectOnly()
         } else {
-            console.error('[ '+self.name+' ] is not a valid project name.');
-            process.exit(1)
+            err = new Error('[ '+self.name+' ] is not a valid project name.');
+            end(err, 'log', true);
         }
     }
 
@@ -84,7 +85,8 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     }
 
     var listProjectOnly = function (){
@@ -102,9 +104,23 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     };
 
+    var end = function (err, type, messageOnly) {
+        if ( typeof(err) != 'undefined') {
+            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.exit( err ? 1:0 );
+    }
+
     init()
 };
 

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/lib/cmd/framework/init.js

@@ -5,8 +5,10 @@ const { execSync }  = require('child_process');
 const { arch } = require('os');
 
 var console         = lib.logger;
+var Domain          = lib.Domain;
 var ginaPath        = getPath('gina').root;
 var help            = require(ginaPath + '/utils/helper');
+// var helpers         = require(getPath('gina').helpers, true);
 
 
 var aliases = require( getPath('gina').lib + '/cmd/aliases.json' );
@@ -590,6 +592,26 @@ function Initialize(opt) {
 
     }
 
+    self.checkDomainLibRequirements = function() {
+        // check for `public_suffix_list.dat`
+        var domainLibPath    = _( getEnvVar('GINA_FRAMEWORK_DIR') + '/lib/domain', true);
+        var distPathObj         = new _(domainLibPath + '/dist', true);
+
+        if ( !distPathObj.existsSync() ) {
+            distPathObj.mkdirSync();
+        }
+        console.debug('Checking for PSL file');
+        var datFilenameObj = new _(distPathObj.toString() + '/public_suffix_list.dat', true);
+        if ( !datFilenameObj.existsSync() ) {
+            try {
+                new Domain({isCachingRrequired: true});
+            } catch (err) {
+                console.error(err.stack||err.message||err);
+                process.exit(1)
+            }
+        }
+    }
+
     self.checkIfCertificatesDir = function() {
         var certsDir = new _( getEnvVar('GINA_HOMEDIR') + '/certificates', true);
         var theRSARootCertsDir = new _(certsDir.toString() + '/RSARootCerts', true);
@@ -617,14 +639,6 @@ function Initialize(opt) {
         }
     }
 
-    // self.setLoggers = function() {
-    //     //var terminal = lib.logger('terminal', require() );
-    // }
-
-
-    // self.checkFrameworkLocals = function() {
-
-    // }
 
     self.readSettings = function() {
         for (let s in self.settings) {