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

package/framework/v0.1.1-alpha.163/lib/domain/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "domain",
+  "version": "1.0.0",
+  "description": "Domain handler",
+
+  "author": {
+    "name": "Maritn-Luther ETOUMAN",
+    "email": "martin-luther@gina.io"
+  },
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "engines": {
+    "node": ">=0.10.22"
+  },
+  "main": "src/main",
+  "scripts": {
+    "test": "nodeunit test"
+  },
+  "license": "MIT",
+  "readmeFilename": "README.md"
+}

package/framework/v0.1.1-alpha.163/lib/domain/src/main.js

@@ -0,0 +1,335 @@
+/*
+ * This file is part of the gina package.
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// nodejs dependencies
+if ( typeof(module) !== 'undefined' && module.exports) {
+    var fs              = require('fs');
+    var execSync        = require('child_process').execSync;
+    try {
+        // With gina framework only
+        var console         =  require('../../logger');
+    } catch (err) {}
+}
+/**
+ * Domain
+ * Credits & thanks to the Mozilla Community :)
+ * https://publicsuffix.org/
+ *
+ * This lib is using Fetch API (NodeJS >= 18.0.0)
+ * 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 - Replace execSync of `curl` to a NodeJS based synchronous request
+ *
+ * @param {string} [options] - { filename: "./dist/public_suffix_list.dat" } `.dat` configuration filename
+ */
+function Domain(options) {
+
+    var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
+    // Detect if user is on IE browser
+    var isIE            = false;
+    if (isGFFCtx) {
+        isIE = !!window.MSInputMethodContext && !!document.documentMode;
+    }
+
+    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/"
+        filename            : "../dist/public_suffix_list.dat",
+        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
+    }
+
+    var self = {
+        options : null,
+        rawPSL  : null,
+        PSL     : [],
+    };
+
+
+    var init = function(proto, options) {
+        if ( typeof(options) == 'undefined' ) {
+            options = defaultOptions
+        } else {
+            // merge options
+            for(let opt in defaultOptions) {
+                if ( typeof(options[opt]) == 'undefined' ) {
+                    options[opt] = defaultOptions[opt];
+                }
+            }
+        }
+
+        if (!isGFFCtx) {
+            options.filename = __dirname +'/'+ options.filename;
+        }
+
+        if (isGFFCtx && options.isCachingRrequired ) {
+            console.warn('[DOMAIN] `options.isCachingRrequired` is only available for backend');
+            options.isCachingRrequired = false
+        }
+
+        self.options = options;
+
+        loadPSL(options);
+
+        console.debug('[DOMAIN] PSL Loaded');
+
+        return proto
+    }
+
+    // TODO - for frontend calls
+    var onReady = function() {
+
+    }
+
+    var loadPSL = async function(opt, isUpdating) {
+        var filenameOrUrl = (isGFFCtx || opt.isCachingRrequired) ? opt.url : opt.filename;
+        isUpdating = ( typeof(isUpdating) != 'undefined' ) ? isUpdating : false
+
+        if (isGFFCtx) {
+
+            if (self.rawPSL && !isUpdating) {
+                return;
+            }
+
+            if (!window.fetch) {// just in case
+                console.error( new Error('[DOMAIN] Fetch API not supported'));
+                return
+            }
+
+            var response = null
+                , result = null
+            ;
+            try {
+                response    = await fetch(filenameOrUrl);
+                result      = await response.text();
+
+                self.rawPSL = result;
+            } catch (err) {
+                // There was an error
+                console.warn('[DOMAIN] Could not load PSL', err.stack || err.message || err);
+            }
+            return;
+        }
+
+        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) {
+                cmd = 'curl -o '+opt.filename +' '+ opt.alternativeUrl +' >/dev/null 2>&1';
+                try {
+                    execSync(cmd);
+                } catch (altErr) {
+                    throw err
+                }
+            }
+
+            // TODO - Synchronize this instead of using CURL
+            // var http = require('http');
+
+            // var port = 80;
+            // var urlArr = opt.url.match(/^(http|https)\:\/\/(.*)\//)[0].split(/\//g);
+            // if ( /\:\d+$/.test(urlArr[1]) ) {
+            //     port = ~~(urlArr[1].match(/\:\d+$/)[0].replace(/^\:/, ''));
+            //     urlArr[1] = urlArr[1].replace(/\:\d+$/, '');
+            // }
+            // var hostname = urlArr[0] +'//'+ urlArr[1];
+            // var path = '/'+ opt.url.split(/\//g).splice(3).join("/");
+
+            // var data = '';
+
+            // var requestOpt = {
+            //     hostname: hostname,
+            //     port: port,
+            //     path: path,
+            //     method: 'GET'
+            // };
+
+            // var req = await http.request(options, (res) => {
+            //     res.setEncoding('utf8');
+            //     res.on('data', (chunk) => {
+            //         console.log(`BODY: ${chunk}`);
+            //         data += chunk;
+            //     });
+            //     res.on('end', () => {
+            //         console.log('No more data in response.');
+            //     });
+            // });
+
+            // req.on('error', (e) => {
+            //     console.error(`problem with request: ${e.message}`);
+            // });
+
+            // req.end();
+
+            // self.rawPSL = data.toString();
+
+        }
+
+        self.rawPSL = fs.readFileSync(filenameOrUrl).toString();
+    }
+
+    var updatePSL = function() {
+        loadPSL(self.options, true);
+    }
+
+
+    /**
+     * Load a json file and removing comments if found
+     *
+     * @return {string} filename - path
+     * @return {boolean} [jsonFormat] - false by default
+     * */
+    var getRootDomain = function(urlOrHostname, jsonFormat) {
+        if ( typeof(jsonFormat) == 'undefined' ) {
+            jsonFormat = false
+        }
+        var isSLD = false
+            , isRegisteredTldOrSld = false
+            , rootDomain = urlOrHostname.replace(/^(.*)\:\/\/|\/(.*)/g, '')
+            // we don't want sub domains: that's why the `.reverse()` is for
+            , rootDomainArr = rootDomain.split(/\./g).reverse()
+            // TLD by default
+            , rootDomainIndex = (rootDomainArr.length) ? rootDomainArr.length-1 : 0
+        ;
+
+        var list = self.rawPSL
+                // remove comments & empty lines
+                .replace(/\/\/\s*(.*)\n|^\s*\n/gm, '')
+                .split(/\n/)
+                .filter( function onFiltered(item, i, iArr) {
+                    // formating ^!, ^. & removing extra junk
+                    // this is specific to the ginven extensions list
+                    if ( /[^a-z 0-9.]+/.test(item) ) {
+                        item = item.replace(/[^a-z 0-9.]+/g, '').replace(/^\./g, '');
+                    }
+
+                    // retain only SLD
+                    if ( /\./.test(item) ) {
+                        if ( !isSLD && new RegExp('.'+item +'$').test(rootDomain) ) {
+                            // Found SLD
+                            isSLD = true;
+                            // console.debug('Found '+ item);
+                            rootDomainIndex = item.split(/\./g).length;
+                            // Stop here
+                            iArr.splice(0, iArr.length);
+                            return false;
+                        }
+
+                        return item
+                    }
+                    // also get tld to check later if valid/registered
+                    return item
+                });
+
+        // Local or unregistered domain
+        rootDomain = rootDomainArr[rootDomainIndex];
+
+        // TLD & SLD
+        if (rootDomainIndex > 0 ) {
+            // rootDomainArr  = rootDomainArr.splice(0, rootDomainIndex);
+            // rootDomain += '.'+ rootDomainArr.reverse().join('.');
+
+            rootDomainArr  = rootDomainArr.splice(0, rootDomainIndex);
+            var suffix = rootDomainArr[0];
+            // Remove port number
+            if ( /\:(.*)$/.test(suffix) ) {
+                suffix = suffix.replace(/\:(.*)$/, '');
+            }
+            isRegisteredTldOrSld = ( isSLD || !isSLD && list.indexOf(suffix) > -1 ) ? true : false;
+            if (isRegisteredTldOrSld /**&& isSLD || !isSLD && list.indexOf(suffix) < 0*/ ) {
+                if (rootDomainIndex > 1 && !isSLD) {
+                    // This is a TLD
+                    rootDomainArr.splice(2);
+                    rootDomain = rootDomainArr.reverse().join('.');
+                } else {
+                    rootDomain += '.'+ rootDomainArr.reverse().join('.');
+                }
+
+            } else {
+                if (rootDomainIndex > 1) {
+                    // Only allowing pseudo TLD here
+                    rootDomainArr.splice(2);
+                    rootDomain = rootDomainArr.reverse().join('.');
+                } else {
+                    rootDomain += '.'+ rootDomainArr.reverse().join('.');
+                }
+            }
+        }
+
+        // Remove port number
+        if ( /\:(.*)$/.test(rootDomain) ) {
+            rootDomain = rootDomain.replace(/\:(.*)$/, '');
+        }
+
+        console.debug('[DOMAIN] isSLD: '+ isSLD, urlOrHostname, ' -> ', rootDomain);
+        if ( /^true$/i.test(jsonFormat) ) {
+            return {
+                rootDomain: rootDomain,
+                isSLD: isSLD,
+                isRegisteredTldOrSld: isRegisteredTldOrSld
+            }
+        }
+        return rootDomain
+    }
+
+    var _proto = {
+        getRootDomain   : getRootDomain
+    };
+    // Backend proto only
+    if (!isGFFCtx) {
+        _proto.updatePSL = updatePSL;
+    }
+    // Frontend only
+    else {
+        _proto.onReady = onReady;
+    }
+
+
+    if (isGFFCtx && isIE && !window.fetch) {
+        // Create Promise polyfill script tag
+        var promiseScript = document.createElement("script");
+        promiseScript.type = "text/javascript";
+        promiseScript.src =
+            "https://cdn.jsdelivr.net/npm/promise-polyfill@8.1.3/dist/polyfill.min.js";
+
+        // Create Fetch polyfill script tag
+        var fetchScript = document.createElement("script");
+        fetchScript.type = "text/javascript";
+        fetchScript.src =
+            "https://cdn.jsdelivr.net/npm/whatwg-fetch@3.4.0/dist/fetch.umd.min.js";
+
+        // Add polyfills to head element
+        document.head.appendChild(promiseScript);
+        document.head.appendChild(fetchScript);
+
+        // Wait for the polyfills to load and run the function.
+        // TODO - add a setinterval to trigger `onFetchReady`event
+        return setTimeout(() => {
+            return init(_proto, options)
+        }, 500);
+    } else {
+        return init(_proto, options)
+    }
+
+
+
+}//EO Domain.
+
+if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
+    // Publish as node.js module
+    module.exports = Domain
+} else if ( typeof(define) === 'function' && define.amd) {
+    // Publish as AMD module
+    define( function() { return Domain })
+}

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

@@ -38,6 +38,7 @@ function Lib() {
         inherits        : _require('./inherits'),
         helpers         : _require('./../helpers'),
         //this one must move to Dev since it's dev related
+        Domain          : _require('./domain'),
         Model           : _require('./model'),
         Collection      : _require('./collection'),
         merge           : _require('./merge'),

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

@@ -1,7 +1,7 @@
 {
   "name": "logger",
   "version": "1.0.0",
-  "description": "Logs hanlder",
+  "description": "Logs handler",
 
   "author": {
     "name": "Maritn-Luther ETOUMAN",

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/lib/logger/src/containers/mq/index.js

@@ -38,9 +38,14 @@ function MqContainer(opt, loggers) {
 
     function onPayload() {
         process.on('logger#'+self.name, function onPayload(payload) {
+            if ( loggers[opt.name]._options.isFlushing ) {
+                return;
+            }
+
             if ( !loggers[opt.name]._options.isReporting ) {
                 return;
             }
+
             if (mqSpeaker.write) {
                 mqSpeaker.write( payload +'\r\n' );
             }

package/framework/{v0.1.1-alpha.161 → v0.1.1-alpha.163}/lib/logger/src/helper.js

@@ -59,6 +59,7 @@
                 throw new Error('Not able to define colors. Please check logger‘s group: `'+ group +'`\n')
             }
 
+
             var now = new Date().format('logger');
             var sCount = s.length;
             if ( sCount < opt._maxLevelLen ) {

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

@@ -238,7 +238,8 @@ function Logger() {
              */
             //off: [5]
         },
-        isReporting: true
+        isReporting: true,
+        isFlushing: false
     };
 
     var getInstance = function() {
@@ -260,7 +261,7 @@ function Logger() {
             getInstance();
             // process.env.NODE_ENV
             if (opt.hierarchies[opt.hierarchy].indexOf( opt.levels['debug'].code) > -1) {
-                emit(opt, 'debug', 'Logger instance already exists: reusing it ;)');
+                emit(opt, 'debug', '`'+ opt.name +' `Logger instance already exists: reusing it ;)');
             }
 
             return self;
@@ -661,8 +662,24 @@ function Logger() {
     self.pauseReporting = function() {
         loggers[ctx._options.name]._options.isReporting = false;
     }
-    self.resumeReporting = function() {
+    self.resumeReporting = function(group) {
+
+        //  [ duplicate output fix ]
+        // if (group && loggers[group]._options) {
+        //     self.warn('[logger]['+ group +'] now resuming ('+ group +')\n');
+        //     loggers[group]._options.isFlushing = false;
+        // }
+
         loggers[ctx._options.name]._options.isReporting = true;
+
+
+
+    }
+
+    //  [ duplicate output fix ]
+    self.flush = function (group) {
+        self.warn('[logger]['+ group +'] now flushing ('+ group +')\n');
+        loggers[group]._options.isFlushing = true;
     }
 
 

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

@@ -223,6 +223,7 @@ function Proc(bundle, proc, usePidFile){
                     code = 0;
                 }
 
+
                 // var bundle = self.bundle;
                 // var env =  process.env.NODE_ENV || 'prod';
                 // var pid = self.getPidByBundleName(bundle);
@@ -264,6 +265,7 @@ function Proc(bundle, proc, usePidFile){
                 if ( typeof(process.list[p]) == 'undefined' || process.list[p] == null )
                     continue;
 
+
                 if ( process.list[p].pid == pid &&  !/^gina\-/.test(process.list[p].name) ) {
                     index       = p;
 
@@ -297,6 +299,9 @@ function Proc(bundle, proc, usePidFile){
             delete process.list[index];
 
         console.debug('[ PROC ] Received '+ signal +' signal to end process [ '+ pid +' ]');
+
+
+
         // handles only signals that cannot be cannot be caught or ignored
         if ( /^(SIGKILL|SIGSTOP|SIGABRT)$/i.test(signal) ) {
             removePidFileSync(pid);
@@ -470,15 +475,20 @@ function Proc(bundle, proc, usePidFile){
             dismiss(existingProcess.pid);
             console.debug('[ PROC ] Don\'t pannic ...');
             existingProcess = null;
+            return;
         }
 
 
+
         if ( /^gina\-/.test(bundle) || !/^gina\-/.test(bundle) && self.bundles.indexOf(bundle) < 0 ) {
             console.debug('[ PROC ] Now registering `'+bundle+'` with PID `'+ pid +'`');
+
+
             var list = {};
 
             var processRegistration = function () {
 
+
                 if (!/^gina\-/.test(bundle) && !existingProcess) {
                     self.bundles.push(bundle);
                 }

package/package.json

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

package/script/post_publish.js

@@ -99,6 +99,8 @@ function PostPublish() {
         }
     }
 
+
+
     var restoreSymlinks = function(done) {
 
         if ( typeof(process.env.npm_config_dry_run) == 'undefined' || !process.env.npm_config_dry_run ) {
@@ -173,7 +175,6 @@ function PostPublish() {
     self.end = function(done) {
 
         restoreSymlinks(done);
-
         done()
     }