gina 0.1.1-alpha.223 → 0.1.1-alpha.225

package/framework/{v0.1.1-alpha.223 → v0.1.1-alpha.225}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.223/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.225/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.223/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.225/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.223 → v0.1.1-alpha.225}/core/config.js

@@ -1199,7 +1199,8 @@ function Config(opt, contextResetNeeded) {
             // e.g: if env == `dev` and we have app.prod.json, we should skip it
             let skipIt = false;
             for (let e = 0, eLen = allEnvs.length; e < eLen; e++) {
-                let re = new RegExp('\.'+ allEnvs[e] +'\.json$');
+                // *.dev.json or *.common.json
+                let re = new RegExp('\.('+ allEnvs[e] +'|common)\.json$');
                 if ( re.test(fName) && allEnvs[e] != env ) {
                     // we should skip it
                     skipIt = true;
@@ -1473,6 +1474,10 @@ function Config(opt, contextResetNeeded) {
             if ( typeof(routing[rule].middleware) == 'undefined' || !routing[rule].middleware )
                 routing[rule].middleware = [];
 
+            if ( typeof(commonMiddlewares) != 'undefined' ) {
+                routing[rule].middleware = merge(commonMiddlewares.slice(), routing[rule].middleware)
+            }
+
             // default url
             if ( typeof(routing[rule].url) == 'undefined' || !routing[rule].url )
                 routing[rule].url = '/'+ rule;

package/framework/{v0.1.1-alpha.223 → v0.1.1-alpha.225}/core/controller/controller.js

@@ -583,9 +583,11 @@ function SuperController(options) {
             // making path thru [namespace &] file
             if ( typeof(localOptions.namespace) != 'undefined' && localOptions.namespace ) {
                 // excepted for custom paths
-                if ( !/^(\.|\/|\\)/.test(file) ) {
+                var fileNamingConvention = file.replace(localOptions.namespace+'-', '');
+                if ( !/^(\.|\/|\\)/.test(file) && file != fileNamingConvention ) {
                     var _ext = data.page.view.ext;
-                    console.warn('file `'+ file +'` used in routing `'+ localOptions.rule +'` does not respect gina naming convention ! You should rename the file `'+ file + _ext +'` to `'+ ''+ file.replace(localOptions.namespace+'-', '') + _ext +'`');
+
+                    console.warn('file `'+ file +'` used in routing `'+ localOptions.rule +'` does not respect gina naming convention ! You should rename the file `'+ file + _ext +'` to `'+ ''+ fileNamingConvention + _ext +'`');
                     console.warn('The reason you are getting this message is because your filename begeins with `<namespace>-`\n If you don\‘t want to rename, use template path like ./../'+ localOptions.namespace +'/'+file);
                     file = ''+ file.replace(localOptions.namespace+'-', '');
                 }

package/framework/{v0.1.1-alpha.223 → v0.1.1-alpha.225}/lib/cmd/framework/init.js

@@ -672,13 +672,13 @@ function Initialize(opt) {
         var datFilenameObj = new _(distPathObj.toString() + '/public_suffix_list.dat', true);
         if ( !datFilenameObj.existsSync() ) {
             try {
-                new Domain({isCachingRrequired: true}, done);
+                new Domain({isCachingRequired: true}, done);
             } catch (err) {
                 // console.error(err.stack||err.message||err);
                 // process.exit(1)
                 return done(err)
             }
-            // new Domain({isCachingRrequired: true}, done);
+            // new Domain({isCachingRequired: true}, done);
         }
 
         done()

package/framework/{v0.1.1-alpha.223 → v0.1.1-alpha.225}/lib/domain/src/main.js

@@ -57,7 +57,7 @@ function Domain(options, cb) {
         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,
+        isCachingRequired  : false,
         isUpdating          : false
     }
 
@@ -84,9 +84,9 @@ function Domain(options, cb) {
             options.filename = __dirname +'/'+ options.filename;
         }
 
-        if (isGFFCtx && options.isCachingRrequired ) {
-            console.warn('[DOMAIN] `options.isCachingRrequired` is only available for backend');
-            options.isCachingRrequired = false
+        if (isGFFCtx && options.isCachingRequired ) {
+            console.warn('[DOMAIN] `options.isCachingRequired` is only available for backend');
+            options.isCachingRequired = false
         }
 
         self.options = options;
@@ -117,7 +117,7 @@ function Domain(options, cb) {
     }
 
     var loadPSL = async function(opt, cb) {
-        var filenameOrUrl   = (isGFFCtx || opt.isCachingRrequired) ? opt.url : opt.filename;
+        var filenameOrUrl   = (isGFFCtx || opt.isCachingRequired) ? opt.url : opt.filename;
         var isUpdating      = ( typeof(opt.isUpdating) != 'undefined' ) ? opt.isUpdating : false;
         var err             = null;
 
@@ -176,10 +176,10 @@ function Domain(options, cb) {
         }
 
         if (!exists) {
-            opt.isCachingRrequired = true;
+            opt.isCachingRequired = true;
         }
 
-        if (opt.isCachingRrequired) { // Fetch is only supported from NodeJS >= 18.0.0
+        if (opt.isCachingRequired) { // 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 {

package/framework/{v0.1.1-alpha.223 → v0.1.1-alpha.225}/lib/logger/src/containers/mq/listener.js

@@ -152,8 +152,6 @@ function MQListener(opt, cb) {
     function startMQListener(opt, cb) {
         var port = opt.port;
         var host = opt.hostV4;
-        // AbortController is a global object
-        const controller = new AbortController();// jshint ignore:line
         var server = net.createServer( function(conn) {//'connection' listener
 
             conn.sessionId = uuid.v4();
@@ -167,7 +165,7 @@ function MQListener(opt, cb) {
                 delete sessions[this.sessionId];
                 if ( this.request != 'report' ) {
                     forwardId = forwardList[this.request].indexOf(this.sessionId);
-                    if ( forwardId > -1 ) {
+                    if ( forwardId > -1 && typeof(forwardList[this.request]) != 'undefined') {
                         forwardList[this.request].splice(forwardId, 1);
                     }
                 }
@@ -284,11 +282,19 @@ function MQListener(opt, cb) {
             }
         });
 
-        server.listen({
+        var listenOption = {
             host: host,
-            port: port,
-            signal: controller.signal
-          }, function() {
+            port: port
+        };
+        var controller = null;
+        // AbortController nodejs >= v15
+        if ( typeof(AbortController) != 'undefined' ) {
+            // AbortController is a global object
+            var controller = new AbortController();// jshint ignore:line
+            listenOption.signal = controller.signal;
+        }
+
+        server.listen(listenOption, function() {
             // Server started.
             console.info('[MQListener] `'+ host +'`is waitting for speakers on port `'+ port +'`');
             if (cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.223",
+  "version": "0.1.1-alpha.225",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -46,12 +46,12 @@
   "config": {
     "optionalPrefix": "~/.npm-global",
     "prefix": "/usr/local",
-    "globalMode": false
+    "globalMode": true
   },
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.223/core/gna",
+  "main": "./framework/v0.1.1-alpha.225/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",
@@ -59,8 +59,5 @@
     "postinstall": "node script/post_install.js"
   },
   "license": "MIT",
-  "readmeFilename": "README.md",
-  "dependencies": {
-    "colors": "^1.4.0"
-  }
+  "readmeFilename": "README.md"
 }

package/script/post_install.js

@@ -748,10 +748,10 @@ function PostInstall() {
         if ( !self.isGlobalInstall || isWin32() ) {
             return done()
         }
-        if (!self.isCustomPrefix || self.prefix == self.defaultPrefix) {
-            return done()
-        }
-
+        // if (!self.isCustomPrefix || self.prefix == self.defaultPrefix) {
+        //     return done()
+        // }
+        var cmd = null;
         var profilePath = getUserHome() + '/.profile';
         var profilePathObj = new _(profilePath);
         if ( !profilePathObj.existsSync() ) {
@@ -787,7 +787,9 @@ function PostInstall() {
 
             // we need to source/update ~/.profile
             try {
-                execSync("source "+ profilePath, {shell: "/bin/bash"});
+                cmd = "source "+ profilePath;
+                console.info('Running: '+ cmd);
+                execSync(cmd, {shell: "/bin/bash"});
             } catch (err) {
                 return done(err)
             }

package/script/pre_install.js

@@ -78,18 +78,6 @@ function PreInstall() {
                 if (/nonexistent$/i.test(self.userInfo.homedir) || !self.userInfo.homedir ) {
                     self.userInfo.homedir = getUserHome()
                 }
-
-                // if (self.isRootUser) {
-                //     console.debug('User `root` detected, changing permissions for `~/.config`& `~/.npm` to avoid install exceptions');
-
-                //     cmd = 'chown -R '+ uid +':'+ gid +' '+ self.userInfo.homedir +'/.config';
-                //     console.debug('Running: '+ cmd);
-                //     execSync(cmd);
-
-                //     cmd = 'chown -R nobody:'+ gid +' '+ self.userInfo.homedir +'/.npm';
-                //     console.debug('Running: '+ cmd);
-                //     execSync(cmd);
-                // }
                 console.warn('If you get errors, try to run: chown -R $(whoami) ~/.npm')
             }
             console.debug('Install user infos:\n'+ JSON.stringify(self.userInfo, null, 2));

package/framework/v0.1.1-alpha.223/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.223