gina 0.1.6-alpha.2 → 0.1.6-alpha.21

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/core/router.js

@@ -118,6 +118,73 @@ function Router(env, scope) {
         // }
         // return ;
 
+
+       var serverInstance   = self.getServerInstance();
+       var config               = null
+            , conf              = null
+            , bundle            = null
+            , env               = null
+            , scope             = null
+            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+       ;
+        try {
+            config      = new Config().getInstance();
+            if (!params.bundle) {
+                try {
+                    //params.bundle = config.bundle;
+                    //params.param = config.routing[config.reverseRouting[params.param.url]];
+                    var _rule = config.reverseRouting[params.param.url];
+                    params = merge(params, config.routing[_rule]);
+                    params.rule = _rule;
+                } catch(reverseRoutingError) {
+                    serverInstance.throwError(response, 500, reverseRoutingError);
+                    return;
+                }
+            }
+            bundle      = local.bundle = params.bundle;
+            env         = config.env;
+            scope       = config.scope;
+            conf        = config[bundle][env];
+        } catch (configErr) {
+            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
+            return;
+        }
+
+        local.cacheless     = cacheless;
+        local.request       = request;
+        local.next          = next;
+        local.conf          = conf;
+        local.isStandalone  = conf.isStandalone;
+
+
+        /**
+         * Reverse proxy check
+         */
+        var requestPort = request.headers.port || request.headers[':port'];
+        var isProxyHost = (
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            &&  /^(80|443)$/.test(requestPort)
+            && conf.server.scheme +'://'+ request.headers.host +':'+ requestPort != conf.hostname.replace(/\:\d+$/, '') +':'+ conf.server.port
+            ||
+            typeof(request.headers[':authority']) != 'undefined'
+            && conf.server.scheme +'://'+ request.headers[':authority'] != conf.hostname
+            ||
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            && /^(80|443)$/.test(requestPort)
+            && request.headers.host == conf.host
+            ||
+            typeof(request.headers['x-nginx-proxy']) != 'undefined'
+            && /^true$/i.test(request.headers['x-nginx-proxy'])
+            ||
+            typeof(process.env.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+
+        setContext('isProxyHost', isProxyHost);
+
+
+
         /**
         * ExpressJS modules + HTTP2 fix
         * Hack required until `express-<plugin>` get support for http2 `express-session`
@@ -140,6 +207,9 @@ function Router(env, scope) {
             ||
             typeof(request.session) != 'undefined'
             && typeof(request.isAuthenticated) == 'undefined'
+            ||
+            typeof(request.session) != 'undefined'
+            && typeof(request.session.passport) != 'undefined'
        ) {
             request.isAuthenticated = function() {
                 var property = 'user';
@@ -284,42 +354,6 @@ function Router(env, scope) {
         * EO Passport JS HTTP2 fix
         */
 
-       var serverInstance   = self.getServerInstance();
-       var config               = null
-            , conf              = null
-            , bundle            = null
-            , env               = null
-            , scope             = null
-            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
-       ;
-        try {
-            config      = new Config().getInstance();
-            if (!params.bundle) {
-                try {
-                    //params.bundle = config.bundle;
-                    //params.param = config.routing[config.reverseRouting[params.param.url]];
-                    var _rule = config.reverseRouting[params.param.url];
-                    params = merge(params, config.routing[_rule]);
-                    params.rule = _rule;
-                } catch(reverseRoutingError) {
-                    serverInstance.throwError(response, 500, reverseRoutingError);
-                    return;
-                }
-            }
-            bundle      = local.bundle = params.bundle;
-            env         = config.env;
-            scope       = config.scope;
-            conf        = config[bundle][env];
-        } catch (configErr) {
-            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
-            return;
-        }
-
-        local.cacheless     = cacheless;
-        local.request       = request;
-        local.next          = next;
-        local.conf          = conf;
-        local.isStandalone  = conf.isStandalone;
 
         if (cacheless) {
             refreshCoreDependencies();
@@ -416,10 +450,10 @@ function Router(env, scope) {
             rootPath        : conf.executionPath || null,
             executionPath   : conf.executionPath || null,
             //instance: self.serverInstance,
-            isUsingTemplate: local.isUsingTemplate,
-            cacheless: cacheless,
-            path: params.param.path || null, // user custom path : namespace should be ignored or left blank
-            assets: {}
+            isUsingTemplate : local.isUsingTemplate,
+            cacheless       : cacheless,
+            path            : params.param.path || null, // user custom path : namespace should be ignored or left blank
+            assets          : {}
         };
 
         if (routeHasViews) {

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/core/server.js

@@ -1035,8 +1035,8 @@ function Server(options) {
                     return name
                 }
 
-                var env     = self.conf.env
-                    , scope = self.conf.scope
+                var env     = self.conf.env || self.env
+                    , scope = self.conf.scope || self.scope
                 ;
 
                 for (let i=0, len=matched.length; i<len; ++i) {
@@ -1054,6 +1054,9 @@ function Server(options) {
                         project = arr[0];
                         env     = (arr[1]) ? arr[1] : env;
                     }
+                    if ( typeof(self.conf[bundle]) == 'undefined' ) {
+                        continue;
+                    }
                     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);

package/framework/v0.1.6-alpha.21/core/template/_gitignore

@@ -0,0 +1,19 @@
+# SCM
+.svn
+.git
+
+# Desktop
+.DS_Store
+._.DS_Store
+desktop.ini
+
+# Project
+.gna
+bundles
+package-lock.json
+node_modules
+npm-debug.log
+releases
+bundles
+logs
+tmp

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/core/template/conf/env.json

@@ -11,9 +11,10 @@
     "error"
   ],
   "defExt": "",
-  "mountPath": "{executionPath}/bundles",
-  "globalTmpPath": "{executionPath}/tmp",
-  "logsPath": "{executionPath}/logs",
+  "homedir": "~/.{projectName}",
+  "mountPath": "{homedir}/bundles",
+  "globalTmpPath": "{homedir}/tmp",
+  "logsPath": "{homedir}/var/logs",
   "{bundle}": {
     "{env}": {
       // This this the Root Domain
@@ -28,7 +29,7 @@
       "projectPath": "{executionPath}",
       "projectVersion": "{projectVersion}",
       "projectVersionMajor": "{projectVersionMajor}",
-      "bundlesPath": "{executionPath}/bundles",
+      "bundlesPath": "{homedir}/bundles",
       "bundlePath": "{bundlesPath}/{bundle}",
       "sharedPath": "{executionPath}/shared",
       "cachePath": "{executionPath}/cache",
@@ -36,7 +37,8 @@
       "cronsPath": "{bundlesPath}/{bundle}/crons",
       "modelsPath": "{bundlesPath}/{bundle}/models",
       "libPath": "{bundlesPath}/{bundle}/lib",
-      "releases": "{executionPath}/releases",
+      "releases": "{homedir}/releases",
+      // "releases": "{executionPath}/releases",
       "sources": "{executionPath}/src",
       "tmpPath": "{executionPath}/tmp",
       "publicPath": "{bundlesPath}/{bundle}/public",

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/lib/cmd/bundle/add.js

@@ -368,7 +368,8 @@ function Add(opt, cmd) {
                 content[local.bundle] = {}
             }
             content[local.bundle][ self.envs[e] ] = {
-                "host" : local.bundle + "-{env}-{scope}-v{projectVersionMajor}.{rootDomain}"
+                "host_if_dns_resolution" : "{rootDomain}",
+                "host" : "localhost"
             };
 
         }

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/lib/cmd/bundle/start.js

@@ -255,7 +255,7 @@ function Start(opt, cmd) {
             , len       = null
         ;
 
-        isRealApp(bundle, function(err, appPath){
+        isRealApp(bundle, function(err, appPath, bundleDir){
 
             if (err) {
                 terminal.error(err.stack||err.message)
@@ -288,6 +288,8 @@ function Start(opt, cmd) {
                     setContext('debugPort', opt.debugPort);
                     setContext('debugBrkEnabled', opt.debugBrkEnabled);
 
+                    // setPath('node_modules', _(self.projectLocation + '/node_modules', true));
+
                     params = [
                         // node arguments will be passed by gina
                         appPath,
@@ -312,9 +314,9 @@ function Start(opt, cmd) {
                         }
                     }
 
-
                     var child = spawn(opt.argv[0], params,
                         {
+                            // cwd: bundleDir,
                             detached: true
                         }
                     );
@@ -611,7 +613,7 @@ function Start(opt, cmd) {
                 } else {
 
                     if (stats.isDirectory()) {
-                        callback(false, d)
+                        callback(false, d, p)
                     } else {
                         callback(new Error('[ ' + d + ' ] is not a directory'))
                     }

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/lib/cmd/framework/build.js

@@ -21,7 +21,7 @@ function Build(opt, cmd){
     var self    = {};
 
     var init = function(opt, cmd) {
-        console.debug('Building framework...');
+        console.log('Building framework, please wait ...');
 
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/lib/cmd/helper.js

@@ -1,5 +1,6 @@
 const { execSync } = require('child_process');
 var fs          = require('fs');
+const { promisify } = require('util');
 var console     = lib.logger;
 var merge       = lib.merge;
 var inherits    = lib.inherits;
@@ -51,12 +52,16 @@ function CmdHelper(cmd, client, debug) {
         projectManifestPath : null, // local project/manifest.json - defined by filterArgs()
         projectConfigPath: null, // path to .gina/projects.json
         projectHomedir: null, // path to ~/.<my-project> ( project $home), defined by loadAssets()
+        projectBundlesPath: null, // real project bundles path
+        projectReleasesPath: null, // real project releases path
+        projectLogsPath: null, // real project logs path
+        projectTmpPath: null, // real project tmp path
         projectData: {}, // Project manifest object
         // current project bundles list {array}
         bundles : [], // defined by filterArgs()
         // don't use this collection to store into files
         bundlesByProject: {}, // bundles collection will be loaded into cmd.projects[$project].bundles
-        bundlesLocation : null,
+        bundlesLocation : null, // symlink to cmd.projects[$project].bundles_path
 
         // current project env.json path
         envPath : null, // path to env.json - defined by filterArgs()
@@ -85,7 +90,6 @@ function CmdHelper(cmd, client, debug) {
 
 
     // merging with default
-    // cmd = merge(cmd, self);
     var _cmd = JSON.clone(cmd);
     _cmd = merge(_cmd, self);
     for (let prop in _cmd) {
@@ -173,7 +177,7 @@ function CmdHelper(cmd, client, debug) {
      *
      * @returns {boolean} isConfigured
      * */
-    isCmdConfigured = function() {
+    isCmdConfigured = async function() {
 
         cmd.configured = ( typeof(cmd.configured) != 'undefined' ) ? cmd.configured : false;
 
@@ -290,7 +294,14 @@ function CmdHelper(cmd, client, debug) {
 
                             if ( folder.toArray().last() == cmd.projectName ) {
                                 cmd.projectLocation = _( folder.toString(), true );
-                            } else {
+                            }
+                            else if (
+                                typeof(cmd.projects[cmd.projectName]) !=  'undefined'
+                                && typeof(cmd.projects[cmd.projectName].path) !=  'undefined'
+                            ) {
+                                cmd.projectLocation = _(cmd.projects[cmd.projectName].path, true);
+                            }
+                            else {
                                 cmd.projectLocation = _( folder.toString(), true );
                             }
 
@@ -304,23 +315,29 @@ function CmdHelper(cmd, client, debug) {
 
                     if ( cmd.projectName && !cmd.projects.count() ) {
                         cmd.projects[cmd.projectName] = {
-                            "path": cmd.projectLocation,
-                            "homedir": cmd.projectHomedir,
-                            "def_prefix": GINA_PREFIX,
-                            "framework": "v" + GINA_VERSION,
-                            "envs": cmd.envs,
-                            "def_env": cmd.defaultEnv,
-                            "dev_env": cmd.devEnv,
-                            "def_scope": cmd.defaultScope,
-                            "local_scope": cmd.localScope,
-                            "production_scope": cmd.productionScope,
-                            "protocols": cmd.protocolsAvailable,
-                            "def_protocol": cmd.defaultProtocol,
-                            "schemes": cmd.schemesAvailable,
-                            "def_scheme": cmd.defaultScheme
+                            "path"              : cmd.projectLocation,
+                            "homedir"           : cmd.projectHomedir,
+                            "bundles_path"      : cmd.projectBundlesPath,
+                            "releases_path"     : cmd.projectReleasesPath,
+                            "logs_path"         : cmd.projectLogsPath,
+                            "tmp_path"          : cmd.projectTmpPath,
+                            "def_prefix"        : GINA_PREFIX,
+                            "framework"         : "v" + GINA_VERSION,
+                            "envs"              : cmd.envs,
+                            "def_env"           : cmd.defaultEnv,
+                            "dev_env"           : cmd.devEnv,
+                            "def_scope"         : cmd.defaultScope,
+                            "local_scope"       : cmd.localScope,
+                            "production_scope"  : cmd.productionScope,
+                            "protocols"         : cmd.protocolsAvailable,
+                            "def_protocol"      : cmd.defaultProtocol,
+                            "schemes"           : cmd.schemesAvailable,
+                            "def_scheme"        : cmd.defaultScheme
                         }
                     }
 
+
+
                     cmd.projectArgvList.push( argv[i].replace('@', '') )
 
                 } else if (mightBeASomeBundle && !/^\@/.test(argv[i]) && isValidName(argv[i]) ) { // bundles list
@@ -522,6 +539,95 @@ function CmdHelper(cmd, client, debug) {
                 cmd.projects[cmd.projectName].homedir = projectHomedirObject.toString()
             }
 
+            // bundles
+            var projectBundlesPathObj = new _(cmd.projects[cmd.projectName].homedir +'/bundles', true);
+            if (!projectBundlesPathObj.existsSync() ) {
+                projectBundlesPathObj.mkdirSync();
+            }
+            cmd.projectBundlesPath = projectBundlesPathObj.toString();
+            // bundles symlink
+            var bundlesLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/bundles', true);
+            if (
+                bundlesLinkPathObj.existsSync()
+                && !bundlesLinkPathObj.isSymlinkSync()
+                ||
+                bundlesLinkPathObj.existsSync()
+                && fs.readlinkSync(bundlesLinkPathObj.toString()) != cmd.projectBundlesPath
+            ) {
+                bundlesLinkPathObj.rmSync();
+            }
+            if (!bundlesLinkPathObj.existsSync()) {
+                projectBundlesPathObj.symlinkSync(bundlesLinkPathObj.toString());
+            }
+            projectBundlesPathObj = null;
+
+            // releases
+            var projectReleasesPathObj = new _(cmd.projects[cmd.projectName].homedir +'/releases', true);
+            if (!projectReleasesPathObj.existsSync() ) {
+                projectReleasesPathObj.mkdirSync();
+            }
+            cmd.projectReleasesPath = projectReleasesPathObj.toString();
+            // releases symlink
+            var releaseLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/releases', true);
+            if (
+                releaseLinkPathObj.existsSync()
+                && !releaseLinkPathObj.isSymlinkSync()
+                ||
+                releaseLinkPathObj.existsSync()
+                && fs.readlinkSync(releaseLinkPathObj.toString()) != cmd.projectReleasesPath
+            ) {
+                releaseLinkPathObj.rmSync();
+            }
+            if (!releaseLinkPathObj.existsSync()) {
+                projectReleasesPathObj.symlinkSync(releaseLinkPathObj.toString());
+            }
+
+            projectReleasesPathObj = null;
+
+            // logs
+            var projectLogsPathObj = new _(cmd.projects[cmd.projectName].homedir +'/var/logs', true);
+            if (!projectLogsPathObj.existsSync() ) {
+                projectLogsPathObj.mkdirSync();
+            }
+            cmd.projectLogsPath = projectLogsPathObj.toString();
+            // logs symlink
+            var logLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/logs', true);
+            if (
+                logLinkPathObj.existsSync()
+                && !logLinkPathObj.isSymlinkSync()
+                ||
+                logLinkPathObj.existsSync()
+                && fs.readlinkSync(logLinkPathObj.toString()) != cmd.projectLogsPath
+            ) {
+                logLinkPathObj.rmSync();
+            }
+            if (!logLinkPathObj.existsSync()) {
+                projectLogsPathObj.symlinkSync(logLinkPathObj.toString());
+            }
+            projectLogsPathObj = null;
+
+            // tmp
+            var projectTmpPathObj = new _(cmd.projects[cmd.projectName].homedir +'/tmp', true);
+            if (!projectTmpPathObj.existsSync() ) {
+                projectTmpPathObj.mkdirSync();
+            }
+            cmd.projectTmpPath = projectTmpPathObj.toString();
+            // tmp symlink
+            var tmpLinkPathObj = new _(cmd.projects[cmd.projectName].path +'/tmp', true);
+            if (
+                tmpLinkPathObj.existsSync()
+                && !tmpLinkPathObj.isSymlinkSync()
+                ||
+                tmpLinkPathObj.existsSync()
+                && fs.readlinkSync(tmpLinkPathObj.toString()) != cmd.projectTmpPath
+            ) {
+                tmpLinkPathObj.rmSync();
+            }
+            if (!tmpLinkPathObj.existsSync()) {
+                projectTmpPathObj.symlinkSync(tmpLinkPathObj.toString());
+            }
+            projectTmpPathObj = null;
+
 
             cmd.projectLocation     = _(cmd.projects[cmd.projectName].path, true);
             cmd.bundlesLocation     = _(cmd.projects[cmd.projectName].path +'/src', true);

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/lib/cmd/project/add.js

@@ -95,8 +95,8 @@ function Add(opt, cmd) {
 
         console.debug('Starting import mode @'+ self.projectName );
         if (!self.projects[self.projectName ]) {
-            console.error('[ '+ self.projectName  +' ] is not an existing project. Instead, use gina projet:add @'+ self.projectName +' --path=/your/project_location');
-            process.exit(1)
+            console.error('[ '+ self.projectName  +' ] is not an existing project. Instead, use gina projet:add @'+ self.projectName +' --path='+ self.projectLocation);
+            process.exit(1);
         }
 
         if ( typeof(self.projects[self.projectName ]) != 'undefined' ) {
@@ -250,6 +250,10 @@ function Add(opt, cmd) {
         projects[self.projectName] = {
             "path"              : self.projectLocation,
             "homedir"           : self.projectHomedir || _(getUserHome() +'/.'+ self.projectName, true),
+            "bundles_path"      : self.projectBundlesPath || _(getUserHome() +'/.'+ self.projectName +'/bunldes', true),
+            "releases_path"     : self.projectReleasesPath || _(getUserHome() +'/.'+ self.projectName +'/releases', true),
+            "logs_path"         : self.projectLogsPath || _(getUserHome() +'/.'+ self.projectName +'/var/logs', true),
+            "tmp_path"          : self.projectTmpPath || _(getUserHome() +'/.'+ self.projectName +'/tmp', true),
             "def_prefix"        : GINA_PREFIX,
             "framework"         : "v" + GINA_VERSION,
             "envs"              : (self.envs && self.envs.length) ? self.envs : self.mainConfig['envs'][ GINA_SHORT_VERSION ],
@@ -660,12 +664,12 @@ function Add(opt, cmd) {
             var scopes  = self.projects[self.projectName].scopes;
             var envs    = self.projects[self.projectName].envs;
             data.bundles[local.bundle] = {
-                "_comment" : "Your comment goes here.",
+                "_comment"  : "Your comment goes here.",
                 "version"   : version,
-                "tag" : ( version.split('.') ).join(''),
-                "src" : "src/" + local.bundle,
+                "tag"       : ( version.split('.') ).join(''),
+                "src"       : "src/" + local.bundle,
                 "link"      : "bundles/"+ local.bundle,
-                "releases" : {}
+                "releases"  : {}
             };
             //"release/"+ local.bundle +"/local/prod/" + version
             for (let s = 0, sLen = scopes.length; s < sLen; ++s) {

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.21}/lib/cmd/project/build.js

@@ -105,6 +105,7 @@ var console     = lib.logger;
 
         var manifest        = local.manifest
             , releasePath   = self.projectLocation +'/'+ manifest.bundles[bundle].releases[scope][env].target
+            // , releasePath   = self.projectReleasesPath +'/'+ manifest.bundles[bundle].releases[scope][env].target
             , release       = new _(releasePath, true)
             , srcPath       = _(self.bundlesLocation +'/'+ bundle, true)
         ;
@@ -120,6 +121,14 @@ var console     = lib.logger;
                 return end(err)
             }
 
+            // creating internal node_modules symlink
+            var internalNodeModulesPathObj = new _( self.projectLocation +'/node_modules', true);
+            if (internalNodeModulesPathObj.existsSync() ) {
+                console.debug('Linking node_modules to from `'+ internalNodeModulesPathObj.toString() +'` to `'+ destination +'/node_modules' +'`');
+                internalNodeModulesPathObj.symlinkSync(_(destination +'/node_modules', true));
+            }
+            internalNodeModulesPathObj = null;
+
             buildEnv(scope, b, e+1);
         })
     }