gina 0.1.1-alpha.162 → 0.1.1-alpha.163

package/framework/{v0.1.1-alpha.162 → 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.162 → 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) {

package/framework/{v0.1.1-alpha.162 → v0.1.1-alpha.163}/lib/cmd/framework/tail.js

@@ -31,10 +31,10 @@ function Tail(opt, cmd) {
     var nIntervId   = null;
     var mqPortFile  = _(getTmpDir() +'/mq-listener-v'+ GINA_VERSION +'.port', true);
 
+
     var init = function(opt, cmd) {
 
         console.debug('Getting framework logs');
-
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
@@ -46,6 +46,7 @@ function Tail(opt, cmd) {
             clearInterval(nIntervId);
             nIntervId = null;
             opt.mqPort = mqPort;
+
             tail(opt, cmd);
         });
 
@@ -82,11 +83,12 @@ function Tail(opt, cmd) {
         var format          = loggerHelper.format;
 
         var delayedMessages = [];
+
         var resumeTail = function() {
+
             var i = 0;
             while (i < delayedMessages.length) {
                 let pl = delayedMessages[i];
-
                 process.stdout.write( format(pl.group, pl.level, pl.content) );
                 i++;
             }
@@ -110,6 +112,9 @@ function Tail(opt, cmd) {
             client.write( JSON.stringify(clientOptions) +'\r\n');
 
         });
+
+
+
         client.on('error', (data) => {
             var err = data.toString();
             console.error('[MQTail] ' + err + ' - Gina might not be running');
@@ -128,6 +133,7 @@ function Tail(opt, cmd) {
 
         var payloads = null, i = null;
         client.on('data', (data) => {
+
             // console.log('[MQTail]  (data): ' + data.toString());
             payloads = data.toString();
 
@@ -137,6 +143,7 @@ function Tail(opt, cmd) {
                 //console.log(payloads);
                 i = -1;
                 while(i < payloads.length) {
+
                     i++;
                     let payload = payloads[i];
                     if (
@@ -152,6 +159,7 @@ function Tail(opt, cmd) {
                         }
 
 
+
                         if (!pl.content) {
                             // only for debug
                             // process.stdout.write( '[MQTail] (undefined content) '+ JSON.stringify(pl, null) +'\n' );
@@ -172,6 +180,13 @@ function Tail(opt, cmd) {
                             continue;
                         }
 
+                        //  [ duplicate output fix ]
+                        // if (loggers[pl.group] && loggers[pl.group]._options.isFlushing) {
+                        //     process.stdout.write(  '[MQTail] '+ pl.group +' => '+ loggers[pl.group]._options.isFlushing +'\n' );
+                        //     break;
+                        // }
+
+
                         // resuming logging from another process
                         // we do not want to print twice in this case since another logger server is already running
                         // if (isResuming) {
@@ -181,6 +196,8 @@ function Tail(opt, cmd) {
                         // only for debug
                         // process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
 
+
+
                         try {
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
                             if (
@@ -223,6 +240,13 @@ function Tail(opt, cmd) {
                                     process.stdout.write('[MQTail] '+ JSON.stringify(payloads, null, 2) +'\n' );
                                 }
                             }
+
+                            //  [ duplicate output fix ]
+                            // if (pl.level == "emerg" && ! /^gina$/.test(pl.group) ) {
+                            //     // flush needed
+                            //     process.stdout.write('[MQTail] Flush needed (2)\n' + '=> '+ loggers[pl.group]._options.isFlushing); //JSON.stringify(pl, null, 2)
+                            //     console.flush(pl.group);
+                            // }
                         } catch (writeErr) {
                             // means that the related MQSpeaker is not connected yet
                             // this can happen during `bundle:start` configuration

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

@@ -31,7 +31,6 @@ function List(opt, cmd) {
             , selectedBundles: null // array if assigned
             , filename: null
         }
-        , local = {}
     ;
 
     var init = function() {
@@ -197,7 +196,8 @@ function List(opt, cmd) {
 
 
 
-        console.log(data)
+        console.log(data);
+        end();
     }
 
 
@@ -440,6 +440,19 @@ function List(opt, cmd) {
         outputTo(str);
     };
 
+    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.162 → v0.1.1-alpha.163}/lib/cmd/scope/list.js

@@ -10,13 +10,14 @@ 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') {
                 listAll()
             } else if ( !isValidName(process.argv[3]) ) {
-                console.error('[ '+process.argv[3]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
-                process.exit(1);
+                err = new Error('[ '+process.argv[3]+' ] is not a valid project name. Please, try something else: @[a-z0-9_.].');
+                end(err, 'log', true);
             }
         } else {
             // is current path == project path ?
@@ -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);
         }
     }
 
@@ -62,7 +63,7 @@ function List(opt, cmd){
         }
         list.sort();
 
-        
+
         for (let p = 0; p<list.length; ++p) {
             projects[list[p]].scopes.sort();
             str += '------------------------------------\n\r';
@@ -82,7 +83,8 @@ function List(opt, cmd){
             str += '\n\r'
         }
 
-        console.log(str)
+        console.log(str);
+        end();
     }
 
     var listProjectOnly = function (){
@@ -98,7 +100,7 @@ function List(opt, cmd){
         str += '------------------------------------\n\r';
         for (let e = 0; e<projects[p].scopes.length; e++) {
             if (!projects[p].def_scope) continue;
-            
+
             if (projects[p].scopes[e] === projects[p].def_scope) {
                 str += '[ * ] ' + projects[p].scopes[e]
             } else {
@@ -107,9 +109,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.163/lib/domain/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.163/lib/domain/README.md

@@ -0,0 +1,46 @@
+# Domain Helper
+
+Get the root domain from an url. Supports SLD (Second Level Domain).
+You can use the script as well for your frontend as for your backend.
+
+### Frontend sample
+
+Load the script from your HTML then from your source
+
+```tty
+// You should for production, cache the file in your own website (http://localhost/psl/public_suffix_list.dat)
+var pslUrl = "https://publicsuffix.org/list/public_suffix_list.dat";
+var getRootDomain = new DomainHelper(pslUrl).getRootDomain;
+
+console.log( getRootDomain("https://camtel.cm/") )
+// => camtel.cm
+
+console.log( getRootDomain("http://google.co.jp/") )
+// => google.co.jp
+
+console.log( getRootDomain("ftp://localhost.localdomain:21/") )
+// => localhost.localdomain
+```
+
+### Backend sample
+```tty
+npm install require('domain-helper')
+```
+
+From your source
+```tty
+var DomainHelper = require('domain-helper')
+var getRootDomain = new DomainHelper().getRootDomain;
+
+console.log( getRootDomain("https://camtel.cm/") )
+// => camtel.cm
+
+console.log( getRootDomain("http://google.co.jp/") )
+// => google.co.jp
+
+console.log( getRootDomain("ftp://localhost.localdomain:21/") )
+// => localhost.localdomain
+```
+
+## License
+[MIT](./LICENSE)