gina 0.1.1-alpha.21 → 0.1.1-alpha.211

package/framework/{v0.1.1-alpha.21 → v0.1.1-alpha.211}/lib/cmd/helper.js

@@ -1,6 +1,9 @@
+const { execSync } = require('child_process');
 var fs          = require('fs');
 var console     = lib.logger;
 var merge       = lib.merge;
+var inherits    = lib.inherits;
+var Collection  = lib.Collection;
 var helpers     = require( getPath('gina').helpers);
 /**
  * CmdHelper
@@ -43,11 +46,13 @@ function CmdHelper(cmd, client, debug) {
         projectArgvList: [],
         // global projects collection {collection}
         projects : null, // defined by filterArgs()
-        projectsPath : _(GINA_HOMEDIR + '/projects.json'), // ~/.gina/project.json
-        // current project path
-        projectPath : null, // local project/manifest.json - defined by filterArgs()
+        projectsPath : _(GINA_HOMEDIR + '/projects.json', true), // ~/.gina/project.json
+        projectsList : [], // Array of project names, asc sorted
+        // current project paths
+        projectManifestPath : null, // local project/manifest.json - defined by filterArgs()
         projectConfigPath: null, // path to .gina/project.json
-        projectData: {},
+        projectHomedir: null, // path to ~/.<my-project> ( project $home)
+        projectData: {}, // Project manifest object
         // current project bundles list {array}
         bundles : [], // defined by filterArgs()
         // don't use this collection to store into files
@@ -77,7 +82,13 @@ function CmdHelper(cmd, client, debug) {
 
 
     // merging with default
-    cmd = merge(cmd, self);
+    // cmd = merge(cmd, self);
+    var _cmd = JSON.clone(cmd);
+    _cmd = merge(_cmd, self);
+    for (let prop in _cmd) {
+        cmd[prop] = _cmd[prop]
+    }
+
 
     var getParams = function () {
 
@@ -148,7 +159,7 @@ function CmdHelper(cmd, client, debug) {
             }
         }
 
-        //console.log('nodeParams ', cmd.nodeParams)
+        // console.debug('nodeParams ', cmd.nodeParams)
     }
 
     /**
@@ -187,6 +198,14 @@ function CmdHelper(cmd, client, debug) {
             }
 
             cmd.projects    = requireJSON( cmd.projectConfigPath );
+            var pIndex      = 0;
+            for (let p in cmd.projects) {
+                if ( new _(cmd.projects[p].path).existsSync() ) {
+                    cmd.projectsList[pIndex] = p;
+                    pIndex++
+                }
+            }
+            cmd.projectsList.sort();
 
             // bundles passed to the CMD
             cmd.bundles = ( typeof(cmd.bundles) == 'undefined' ) ? [] : cmd.bundles;
@@ -330,7 +349,7 @@ function CmdHelper(cmd, client, debug) {
 
                         cmd.projectName = folder;
                         cmd.projectLocation = _(process.cwd(), true);
-                    } else if (!/\:help$/.test(cmd.task)) {
+                    } else if (!/\:help$/.test(cmd.task) && !/port\:reset$/.test(cmd.task) ) {
 
                         errMsg = 'No project name found: make sure it starts with `@` as `@<project_name>`';
                         console.error(errMsg);
@@ -340,7 +359,7 @@ function CmdHelper(cmd, client, debug) {
                 }
             }
 
-            // only when adding a project
+            // Additional project checking & actions
             if (cmd.projectName != null) {
                 // valid name but not in projects and task != :add, :remove or :import
                 if ( typeof(cmd.projects[cmd.projectName]) == 'undefined' && !/\:(add|import|remove)$/.test(cmd.task) ) {
@@ -351,10 +370,10 @@ function CmdHelper(cmd, client, debug) {
                 }
 
                 if ( typeof(cmd.projects[cmd.projectName]) == 'undefined') {
-                    cmd.projectPath = _(cmd.projectLocation + '/manifest.json', true)
+                    cmd.projectManifestPath = _(cmd.projectLocation + '/manifest.json', true)
                 }
 
-                cmd.projectPath = (!cmd.projectPath) ? _(cmd.projects[cmd.projectName].path + '/manifest.json', true) : cmd.projectPath;
+                cmd.projectManifestPath = (!cmd.projectManifestPath) ? _(cmd.projects[cmd.projectName].path + '/manifest.json', true) : cmd.projectManifestPath;
 
                 if (typeof (cmd.projects[cmd.projectName]) != 'undefined') // ignore when adding project
                     cmd.envPath = _(cmd.projects[cmd.projectName].path + '/env.json', true);
@@ -367,7 +386,9 @@ function CmdHelper(cmd, client, debug) {
 
 
             loadAssets();
-            cmd.configured = true;
+
+            // cmd.configured = true;
+            var err = null;
 
             return true; // completed configuration
 
@@ -423,17 +444,42 @@ function CmdHelper(cmd, client, debug) {
             //&& !cmd.params['force']
         ) { // ignore when adding project
 
+            if (!cmd.projectManifestPath) {
+                cmd.projectManifestPath =  _(cmd.projects[cmd.projectName].path + '/manifest.json', true);
+            }
 
-            if ( typeof(require.cache[cmd.projectPath]) != 'undefined') {
-                delete require.cache[require.resolve(cmd.projectPath)]
+            if ( typeof(require.cache[cmd.projectManifestPath]) != 'undefined') {
+                delete require.cache[require.resolve(cmd.projectManifestPath)]
             }
-            if ( ! new _(cmd.projectPath).existsSync() ) {
-                console.error('A project with this name is already added. If you want to override, you should try to add: `--force` at the end of your command line');
+            if ( ! new _(cmd.projectManifestPath).existsSync() ) {
+                console.error('Project manifest.json not found. If you want to fix this, you should try to project:add with `--force` argument at the end of your command line');
                 return process.exit(1);
             }
 
-            cmd.projectData         = requireJSON(cmd.projectPath);
-            cmd.projectLocation     = cmd.projects[cmd.projectName].path;
+            cmd.projectData         = requireJSON(cmd.projectManifestPath);
+
+            cmd.projectHomedir      = (
+                                        typeof(cmd.projects[cmd.projectName].homedir) != 'undefined'
+                                        && cmd.projects[cmd.projectName].homedir != ''
+                                        && cmd.projects[cmd.projectName].homedir != 'null'
+                                        && cmd.projects[cmd.projectName].homedir != null
+                                    ) ? _(cmd.projects[cmd.projectName].homedir, true)
+                                    : _(getUserHome() +'/.'+ cmd.projectName, true);
+            var projectHomedirObject = new _(cmd.projectHomedir, true);
+            console.debug('Creating project homedir');
+            if (projectHomedirObject.existsSync() && !projectHomedirObject.isDirectory() ) {
+                throw new Error('Found ' + projectHomedirObject.toString() + ': but it appears to be a symbolik link !');
+            } else if (!projectHomedirObject.existsSync() ) {
+                projectHomedirObject.mkdirSync();
+                cmd.projects[cmd.projectName].homedir = projectHomedirObject.toString();
+            }
+
+            if ( typeof(cmd.projects[cmd.projectName].homedir) == 'undefined' ) {
+                cmd.projects[cmd.projectName].homedir = cmd.projectHomedir
+            }
+
+
+            cmd.projectLocation     = _(cmd.projects[cmd.projectName].path, true);
             cmd.bundlesLocation     = _(cmd.projects[cmd.projectName].path +'/src', true);
             cmd.envPath             = _(cmd.projects[cmd.projectName].path + '/env.json', true);
 
@@ -540,6 +586,52 @@ function CmdHelper(cmd, client, debug) {
                     }
                 }
             }
+
+            cmd.configured = true;
+
+            // detect lib/node_modules
+            // if (
+            //     cmd.projectName != null
+            //     && /^true$/i.test(GINA_GLOBAL_MODE)
+            //     && !/\:(link|link-node-modules)$/.test(cmd.task)
+            //     && !/(project\:add)$/.test(cmd.task)
+            // ) {
+            //     console.debug('Running: gina link-node-modules @'+cmd.projectName);
+            //     err = execSync('gina link-node-modules @'+cmd.projectName); // +' --inspect-gina'
+            //     console.debug(err.toString());
+            //     if (err instanceof Error) {
+            //         console.error(err.message || err.stack);
+            //         return exit(err.message || err.stack);
+            //     }
+            // }
+
+            // linking gina
+            if (
+                cmd.projectName != null
+                && /^true$/i.test(GINA_GLOBAL_MODE)
+                && !/\:(link|link-node-modules)$/.test(cmd.task)
+            ) {
+                if (
+                    /project\:(start|stop)$/.test(cmd.task)
+                    ||
+                    /bundle\:(start|stop)$/.test(cmd.task)
+                ) {
+                    console.debug('Running: gina link-node-modules @'+cmd.projectName);
+                    err = execSync('gina link-node-modules @'+cmd.projectName);// +' --inspect-gina'
+                    if (err instanceof Error) {
+                        console.error(err.message || err.stack);
+                        return exit(err.message || err.stack);
+                    }
+                }
+
+
+                console.debug('Running: gina link @'+cmd.projectName);
+                err = execSync('gina link @'+cmd.projectName);// +' --inspect-gina'
+                if (err instanceof Error) {
+                    console.error(err.message || err.stack);
+                    return exit(err.message || err.stack);
+                }
+            }
         }
 
         //console.debug('[ ConfigAssetsLoaderHelper ] Loaded portsData\n'+ JSON.stringify(cmd.portsData, null, 4));
@@ -1034,7 +1126,7 @@ function CmdHelper(cmd, client, debug) {
                     let scheme = allProjectSchemes[s];
                     // skipping none `https` schemes for `http/2`
                     if ( /^http\/2/.test(protocol) && scheme != 'https' ) {
-                        console.debug('skipping none `https` schemes for `http/2`');
+                        // console.debug('skipping none `https` schemes for `http/2`');
                         continue;
                     }
                     if ( typeof(ports[protocol][scheme]) == 'undefined' ) {
@@ -1129,6 +1221,26 @@ function CmdHelper(cmd, client, debug) {
         }
     }
 
+    orderBundles = function(bundles) {
+        var bList = [], i = 0;
+        for (let b in bundles) {
+            bList[i] = bundles[b];
+            bList[i].name = b;
+            i++;
+        }
+
+        bList = new Collection(bList)
+            .orderBy({name: 'asc'})
+            .toRaw();
+
+        var newBundles = {}
+        for (let i = 0, len = bList.length; i < len; i++) {
+            newBundles[ bList[i].name ] = bList[i]
+        }
+
+        return newBundles;
+    }
+
 
     exit = function(errorMessage) {
         // CMD Client exit
@@ -1142,6 +1254,7 @@ function CmdHelper(cmd, client, debug) {
             process.exit()
         }
     }
+
 };
 
 module.exports = CmdHelper;

package/framework/{v0.1.1-alpha.21 → v0.1.1-alpha.211}/lib/cmd/index.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
- * Gina.Utils.cmd
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Gina.Lib.cmd
+ * Copyright (c) 2009-2023 Rhinostone <contact@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
@@ -37,7 +37,7 @@ cmd.setOption = function(option) {
             cmd.option[option[i].name] = option[i].content
         }
     } else {
-        cmd.option[options.name] = option.content
+        cmd.option[options.name] = option.content// jshint ignore:line
     }
 }
 
@@ -46,8 +46,8 @@ cmd.getString = function() {
         .toString()
         .replace(/,/g,' ')
         .replace(/node\s/g, 'gina ');
-        //.replace(/node/g, 'gina');    
-    
+        //.replace(/node/g, 'gina');
+
     var cmdArr = cmd.split('/');
     cmd = cmdArr[cmdArr.length-1];
     return cmd
@@ -71,14 +71,14 @@ cmd.getOptions = function() {
 
 
 cmd.onExec = function(client, isFromFramework, opt) {
-    
-    var console = lib.logger;
+
+    var console = lib.logger;// jshint ignore:line
     cmd.option = opt;
-        
-    var Proc = require( getPath('gina').lib + '/proc');
+
+    var Proc = require( getPath('gina').lib + '/proc');// jshint ignore:line
     var self = {};
 
-    cmd.msg = require( _(__dirname + '/framework/msg.json') );
+    cmd.msg = require( _(__dirname + '/framework/msg.json') );// jshint ignore:line
     self.isFromFramework = opt.isFromFramework || isFromFramework || false;
     self.isOnlineCommand = opt.isOnlineCommand || false;
 
@@ -93,38 +93,38 @@ cmd.onExec = function(client, isFromFramework, opt) {
 
     var init = null;
     if (self.isFromFramework) {
-        
+
         init = require('./framework/init')(opt);
         //Framework CMD.
         if (opt.task.action == 'start') {
-            // Current version of the framework by default 
+            // Current version of the framework by default
             // But can be overriden with argument: @{version_number}
             // eg.: gina stop @1.0.0
-            self.version = getEnvVar('GINA_VERSION');
+            self.version = getEnvVar('GINA_VERSION');// jshint ignore:line
             // checkcking version number
             if ( typeof(opt.argv[3]) != 'undefined' && /^@/.test(opt.argv[3]) ) {
                 var err = null;
-                var version = opt.argv[3].replace(/\@/, '');            
+                var version = opt.argv[3].replace(/\@/, '');
                 var shortVersion = version.split('.').splice(0,2).join('.');
                 if ( !/^\d\.\d/.test(shortVersion) ) {
                     err = new Error('Wrong version: '+ version);
                     console.log(err.message);
                     return;
                 }
-                var availableVersions = requireJSON(_(getEnvVar('GINA_HOMEDIR') +'/main.json', true)).frameworks[shortVersion];
+                var availableVersions = requireJSON(_(getEnvVar('GINA_HOMEDIR') +'/main.json', true)).frameworks[shortVersion];// jshint ignore:line
                 if ( availableVersions.indexOf(version) < 0 ) {
                     err = new Error('Version not installed: '+ version);
                     console.log(err.message);
                     return;
                 }
-                
+
                 self.version = version;
             }
-            
+
             init.onComplete( function done(err, run){
                 console.debug('loading task `',  opt.task.topic +':'+ opt.task.action, '`');
-                
-                //Setting master process with its own PID file.                
+
+                //Setting master process with its own PID file.
                 cmd.proc = new Proc('gina-v' + self.version, process);
                 cmd.proc.setMaster(process.pid);
 
@@ -142,7 +142,7 @@ cmd.onExec = function(client, isFromFramework, opt) {
                 })
             })
         } else { // Offline CMD
-            init.onComplete( function done(err, run, opt){                
+            init.onComplete( function done(err, run, opt){
                 run(opt)
             })
         }
@@ -154,11 +154,11 @@ cmd.onExec = function(client, isFromFramework, opt) {
         }
         opt.task.topic  = arr[0];
         opt.task.action = arr[1];
-        
+
         console.debug('[ FRAMEWORK ] is starting online CLI '+ arr[0] +':'+arr[1]);
-        
+
         init = require('./framework/init')(opt);
-        init.onListen( function done(err, run, opt){            
+        init.onListen( function done(err, run, opt){
             run(opt, cmd)
         })
 

package/framework/{v0.1.1-alpha.21 → v0.1.1-alpha.211}/lib/cmd/port/inc/scan.js

@@ -15,8 +15,12 @@ module.exports = function Scanner(opt, cb){
         // default binding for localhost
         // remote scan can be added later if needed (e.g: for remote setup)
         host: 'localhost',
+        // --start-port-from
+        startFrom: null,
         start: 3100,
-        end: 3999,// max 65535,
+        // max 65535, but user assigned == 49151 - see [RFC6335](https://www.rfc-editor.org/rfc/rfc6335.html)
+        end: null,
+        maxEnd: 49151,
         timeout: 2000,
         ignore: [],
         limit: 1
@@ -29,6 +33,17 @@ module.exports = function Scanner(opt, cb){
     } else {
         opt = merge(opt, defaultOptions)
     }
+    if (opt.startFrom) {
+        opt.startFrom = ~~opt.startFrom;
+        if (opt.start < opt.startFrom ) {
+            opt.start = opt.startFrom;
+        }
+    }
+    opt.end = (~~(opt.start)+899) // shouldn't it be opt.limit+1 ?
+
+    // just in caes
+    opt.end = ~~(opt.end);
+    opt.ignore.sort();
 
     console.debug('scan init with options: ', opt);
 
@@ -46,20 +61,19 @@ module.exports = function Scanner(opt, cb){
             cb(err);
             return;
         }
-        
+
         // skip port present in the `ignore list`
         if ( opt.ignore.length > 0 && opt.ignore.indexOf( ''+port ) > -1 ) {
             port++;
-            find(port);
-            return;
+            return find(port);
         }
-        
+
         // creating socket
-        var s = new net.Socket();        
+        var s = new net.Socket();
 
         // starting connection
         s.connect(port, self.host);
-        
+
         // just in case
         s.setTimeout(opt.timeout);
         s.on('timeout', function() {
@@ -67,15 +81,17 @@ module.exports = function Scanner(opt, cb){
             s.destroy(err);
             cb(err)
         });
-        
+
 
         // No one is listening ... port is available
         s.on('error', function(err) {
-            s.destroy();   
+            s.destroy();
             // silently catch all errors - assume the port is closed => available for use
-            if ( /ECONNREFUSED/i.test(err.message) ) {                
-                if ( !opt.ignore.length || opt.ignore.length > 0 && opt.ignore.indexOf( ''+port ) == -1 ) {
-                    ports.push(''+port);
+            if ( /ECONNREFUSED/i.test(err.message) ) {
+                if ( !opt.ignore.length || opt.ignore.length > 0 && opt.ignore.indexOf( port ) == -1 ) {
+                    // ports.push(''+port);
+                    ports.push(port);
+                    ports.sort();
                     console.debug('available port found '+ port +' ['+ ports.length +'/'+ total +']');
                     opt.limit--;
                 }
@@ -92,15 +108,15 @@ module.exports = function Scanner(opt, cb){
                 console.warn('exeption not handled: '+ err);
                 cb(err);
                 return;
-            } 
+            }
         });
-        
+
         // if connection is made, this only means that service is using it
         s.on('connect', function() {
             s.destroy();
-            
+
             port++;
-            find(port);           
+            find(port);
         })
     };