gina 0.1.6-alpha.149 → 0.1.6-alpha.150

package/framework/{v0.1.6-alpha.149 → v0.1.6-alpha.150}/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.6-alpha.149/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.150/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":9,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.150/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","count","routing","reverseRouting","rule","url","urls","split","r","rLen","length","prop","isProxyHost","__defineGetter__","_this","Date","parseInt","getTime","timeout","bundle","routes","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","matched","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","headEls","existingLinks","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.6-alpha.149 → v0.1.6-alpha.150}/core/controller/controller.renderSwig.js

@@ -1,7 +1,9 @@
 const fs = require('fs');
 
-var lib             = require('./../../lib') || require.cache[require.resolve('./../../lib')];
-var Collection      = lib.Collection;
+const lib             = require('./../../lib') || require.cache[require.resolve('./../../lib')];
+const Collection      = lib.Collection;
+const cache           = new lib.Cache();
+
 // Inherited from controller
 var self                = null
     , local             = null
@@ -12,6 +14,8 @@ var self                = null
     , SwigFilters       = null
     , headersSent       = null
     , cachedTemplates   = null
+    , cachedIndexes     = null
+    , cachedHtml        = null
     , cachePath         = null
 ;
 /**
@@ -35,9 +39,13 @@ var self                = null
  * */
 async function render(userData, displayToolbar, errOptions) {
 
-    // Using server cache to cache compileTemplates
-    cachedTemplates = self.serverInstance._cached.templates;
+    // Using server cache to cache compiledTemplates
+    cache.from(self.serverInstance._cached);
+
     cachePath       = self.serverInstance._cachePath;
+    // cachedTemplates = self.serverInstance._cached.templates;
+    // cachedIndexes   = self.serverInstance._cached.indexes || null;
+    // cachedHtml      = self.serverInstance._cached.html || null;
 
     var err = null;
     var isRenderingCustomError = (
@@ -64,6 +72,8 @@ async function render(userData, displayToolbar, errOptions) {
         , template          = null
         , file              = null
         , path              = null
+        , htmlContent       = null
+        , cacheKey          = null
         , plugin            = null
         // By default
         , isWithoutLayout   = (localOptions.isWithoutLayout) ? true : false
@@ -191,11 +201,12 @@ async function render(userData, displayToolbar, errOptions) {
     }
     pageContentObj = null;
 
+    cacheKey = 'swig:' + localOptions.bundle + subFolder +'/'+ data.page.view.file;
     // Retrieve layoutPath from content
     if (
         hasLayoutInPath
         && _templateContent
-        && typeof(cachedTemplates[ localOptions.bundle + subFolder +'/'+ data.page.view.file ]) == 'undefined'
+        && !cache.has(cacheKey)
     ) {
 
         // subFolder       = path.split(/\//g).slice(0, -1).join('/').replace(localOptions.template.html, '');
@@ -209,6 +220,7 @@ async function render(userData, displayToolbar, errOptions) {
                 // adding layout
                 var newLayoutPath = 'swig' + subFolder  +'/'+ layoutPath;
                 newLayoutFilename = _(cachePath +'/'+ localOptions.bundle +'/'+ newLayoutPath, true);
+
                 if ( !fs.existsSync( newLayoutFilename ) ) {
                     var newLayoutDir = newLayoutFilename.split(/\//g).slice(0, -1).join('/');
                     var newLayoutDirObj = new _(newLayoutDir);
@@ -225,7 +237,6 @@ async function render(userData, displayToolbar, errOptions) {
                 }
 
                 // updating extends
-                // _templateContent = _templateContent.replace(layoutPath, '../../../../cache/'+ localOptions.bundle +'/'+ newLayoutPath);
                 _templateContent = _templateContent.replace(layoutPath, _(cachePath +'/'+ localOptions.bundle +'/'+ newLayoutPath, true) );
 
                 // override layout path
@@ -524,9 +535,10 @@ async function render(userData, displayToolbar, errOptions) {
         if (
             /**!self.isCacheless()
             &&*/
-            typeof(cachedTemplates[ localOptions.bundle + subFolder  +'/'+ data.page.view.file ]) != 'undefined'
+            cache.has(cacheKey)
         ) {
-            compiledTemplate = cachedTemplates[ localOptions.bundle + subFolder  +'/'+ data.page.view.file ];
+            // compiledTemplate = cachedTemplates[ localOptions.bundle + subFolder  +'/'+ data.page.view.file ];
+            compiledTemplate = cache.get(cacheKey).template;
 
             if ( !headersSent() ) {
                 if ( localOptions.isRenderingCustomError ) {
@@ -894,23 +906,79 @@ async function render(userData, displayToolbar, errOptions) {
                 fd = null;
             }
 
-
-
             // Last compilation before rendering
             // Now we can use `data` instead of `swigData`
             mapping = { filename: path  };
             compiledTemplate = swig.compile(_templateContent, mapping);
-            if ( !self.isCacheless && hasLayoutInPath) {
+
+            if (
+                /**!self.isCacheless
+                &&*/ hasLayoutInPath
+                && !cache.has(cacheKey)
+            ) {
                 // Caching template
-                cachedTemplates[ localOptions.bundle + subFolder  +'/'+ data.page.view.file ] = compiledTemplate;
+                cache.set(cacheKey, {
+                    template: compiledTemplate
+                });
             }
 
             if ( !headersSent() ) {
                 if ( localOptions.isRenderingCustomError ) {
                     localOptions.isRenderingCustomError = false;
                 }
+                htmlContent = compiledTemplate(data);
+                local.res.setHeader('content-type', localOptions.conf.server.coreConfiguration.mime['html'] + '; charset='+ localOptions.conf.encoding );
+
+                if (
+                    !self.isCacheless
+                    && typeof(local.req.routing.cache) != 'undefined'
+                    && /^GET$/i.test(local.req.method)
+                ) {
+                    cacheKey = "html:"+ local.req.url;
+                    if ( !cache.has(cacheKey) ) {
+                        // Caching to memory
+                        if ( /^memory$/i.test(local.req.routing.cache) ) {
+                            cache.set(cacheKey, {
+                                content         : htmlContent,
+                                responseHeaders : local.res.getHeaders(),
+                                fromMemory      : true,
+                                // ttl             : 120 // In secs
+                            });
+                        }
+                        // Caching to file
+                        if ( /^static$/i.test(local.req.routing.cache) ) {
+                            var url = local.req.url;
+                            if ( /\/$/.test(url) ) {
+                                url += 'index'
+                            }
+                            var htmlFilename = _(cachePath +'/'+ localOptions.bundle +'/html'+ url + '.html', true);
+                            var htmlDir = htmlFilename.split(/\//g).slice(0, -1).join('/');
+                            var htmlDirObj = new _(htmlDir);
+                            if ( !htmlDirObj.existsSync() ) {
+                                htmlDirObj.mkdirSync()
+                            }
+                            htmlDirObj = null;
+
+                            console.debug("Writting cache to: ", htmlFilename);
+                            fd = fs.openSync(htmlFilename, 'w'); // Open file for writing
+                            buffer = Buffer.from( htmlContent );
+                            fs.writeSync(fd, buffer, 0, buffer.length, 0); // Write the buffer
+                            buffer = null;
+                            fs.closeSync(fd); // Close the file descriptor
+                            fd = null;
+
+                            cache.set(cacheKey, {
+                                filename        : htmlFilename,
+                                responseHeaders : local.res.getHeaders()
+                            });
+                        }
+                    }
+                }
+
+
                 console.info(local.req.method +' ['+local.res.statusCode +'] '+ local.req.url);
-                local.res.end( compiledTemplate(data) );
+                local.res.end( htmlContent );
+
                 layout = null;
             }
 

package/framework/{v0.1.6-alpha.149 → v0.1.6-alpha.150}/core/deps/swig-1.4.2/dist/swig.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/../../deps/swig-1.4.2/dist/swig.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.150/core/asset/plugin/../../deps/swig-1.4.2/dist/swig.min.js",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/../../deps/swig-1.4.2/bin/swig.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.150/core/asset/plugin/../../deps/swig-1.4.2/bin/swig.js"],
 "names":["swig","require","optimist","fs","path","filters","utils","uglify","command","argv","usage","describe","v","o","h","j","c","m","alias","default","check","_","length","Error","shift","ctx","out","file","str","console","log","efn","anonymous","files","fn","version","process","exit","JSON","parse","readFileSync","normalize","mkdirSync","e","errno","basename","writeFileSync","flags","each","resolve","filter","name","setFilter","tags","tag","setTag","compile","ends","block","options","setDefaults","r","precompile","filename","locals","tpl","toString","replace","minify","fromString","code","eval","__tpl","render","forEach"]
 }

package/framework/{v0.1.6-alpha.149 → v0.1.6-alpha.150}/core/server.isaac.js

@@ -14,6 +14,7 @@ const inherits          = lib.inherits;
 const merge             = lib.merge;
 const console           = lib.logger;
 const Collection        = lib.Collection;
+const cache             = new lib.Cache();
 
 
 const env               = process.env.NODE_ENV
@@ -79,6 +80,7 @@ function ServerEngineClass(options) {
         , localCachePathObj     = null
     ;
     try {
+
         // Adding cache directory if not found
         cachePathObj = new _(options.cachePath, true);
         localCachePathObj = new _(options.cachePath +'/'+ options.bundle, true);
@@ -310,6 +312,10 @@ function ServerEngineClass(options) {
             , isCacheless       = options.isCacheless
             , assetsCollection  = new Collection(localAssets)
             , localAsset        = null
+            , cachedContents    = null
+            , cachedContentObj  = null
+            , cachedIndexes     = []
+            , cachedIndexe      = null
         ;
 
 
@@ -420,6 +426,7 @@ function ServerEngineClass(options) {
                 }
 
                 if (!isBinary) {
+                    console.info(request.method +' [200] '+ request.url);
                     return response.end(localAsset.content);
                 }
 
@@ -435,6 +442,58 @@ function ServerEngineClass(options) {
                 refreshCore()
             }
 
+            if (!isCacheless) {
+                var cacheStatus = 'gina;';
+                // Importing cache handler
+                cache.from(server._cached);
+                var cacheKey = 'html:' + request.url;
+                if ( cache.has(cacheKey) ) {
+                    if ( /^GET$/i.test(request.method) ) {
+                        // Getting cache from key
+                        cachedContentObj = cache.get(cacheKey);
+
+                        // Getting the headers
+                        cacheStatus += ' hit;';
+                        if ( typeof(cachedContentObj.ttl) != 'undefined' && cachedContentObj.ttl > 0) {
+                            var createdAt = cachedContentObj.createdAt.getTime()+ (~~(cachedContentObj.ttl)*1000);
+                            var remainingSeconds = Math.floor( (createdAt - new Date().getTime()) /1000);
+
+                            cacheStatus += ' ttl='+remainingSeconds;
+                            createdAt = null;
+                            remainingSeconds = null;
+                        }
+                        response.setHeader('cache-status', cacheStatus);
+
+                        if ( typeof(cachedContentObj.responseHeaders) != 'undefined' ) {
+                            for (let h in cachedContentObj.responseHeaders ) {
+                                response.setHeader(h, cachedContentObj.responseHeaders[h]);
+                            }
+                        }
+                        if (
+                            typeof(cachedContentObj.fromMemory) != 'undefined'
+                        ) {
+                            console.info(request.method +' [200]['+ cacheStatus +'] '+ request.url);
+                            return response.end(cachedContentObj.content);
+                        }
+
+                        filename  =  _(cachedContentObj.filename, true);
+
+                        return fs.createReadStream(filename)
+                            .on('error', function onError(err) {
+                                console.error("[SERVER][CACHE][FILE ERROR] ", err.stack|err.message|err);
+                                return response.end(''+ err.stack|err.message|err);
+                            })
+                            .on('end', function onResponse(){
+                                console.info(request.method +' [200] '+ request.url);
+                            })
+                            .pipe(response);
+                    }
+                    console.warn("[SERVER][CACHE] ignoring key `"+ cacheKey+ "` because method != GET");
+
+                } // EO if ( cache.has(cacheKey) )
+            } // EO if (!isCacheless)
+
+
 
             if ( /engine.io/.test(request.url)) {
                 console.debug('[ SERVER ] engine.io request');

package/framework/{v0.1.6-alpha.149 → v0.1.6-alpha.150}/core/server.js

@@ -343,10 +343,7 @@ function Server(options) {
             instance.completeHeaders    = completeHeaders;
 
             if ( typeof(instance._cached) == 'undefined' ) {
-                instance._cached = {
-                    // Compiled templates
-                    templates: {}
-                }
+                instance._cached = new Map();
             }
             if ( typeof(instance._cachedPath) == 'undefined' ) {
                 instance._cachePath = self.conf[self.appName][self.env].server.cachePath;
@@ -1274,7 +1271,7 @@ function Server(options) {
 
         // update response
         try {
-            if ( responseHeaders && responseHeaders.count() > 0 ) {
+            if ( responseHeaders && Object.keys(responseHeaders).length > 0 ) {
                 return merge(responseHeaders, response.getHeaders());
             }
             return response.getHeaders();
@@ -1901,7 +1898,7 @@ function Server(options) {
                             completeHeaders(null, request, response);
                             response.setHeader('content-type', contentType +'; charset='+ bundleConf.encoding);
                             // if (/\.(woff|woff2)$/i.test(filename) )  {
-                            //     response.setHeader("Transfer-Encoding", 'Identity')
+                            //     response.setHeader("transfer-encoding", 'Identity')
                             // }
 
 
@@ -3043,6 +3040,7 @@ function Server(options) {
                     namespace           : routing[name].namespace || undefined,
                     url                 : decodeURI(pathname), /// avoid %20
                     rule                : routing[name].originalRule || name,
+                    cache               : routing[name].cache || null,
                     // We clone because we are going to modify it while comparing urls
                     param               : JSON.clone(routing[name].param),
                     // We clone because we are going to modify it while routing (.splice(..))

package/framework/v0.1.6-alpha.150/lib/cache/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "gina-lib-cache",
+  "version": "1.0.0",
+  "description": "Cache hanlder",
+
+  "author": {
+    "name": "Maritn-Luther ETOUMAN",
+    "email": "contact@gina.io"
+  },
+  "copyright": "Copyright (c) 2009-2025 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.6-alpha.150/lib/cache/src/main.js

@@ -0,0 +1,160 @@
+'use strict';
+if ( typeof(module) !== 'undefined' && module.exports ) {
+    var lib = require('../../index');
+}
+
+var cache = new Map();
+
+function Cache() {
+    var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
+    var merge           = (isGFFCtx) ? require('lib/merge') : require('../../../lib/merge');
+
+    var instance = {};
+    var importedMapInstance = null;
+
+    /**
+     * Import exixting cache
+     * @param {array} initialCache
+     */
+    instance['from'] = function(initialCache) {
+        cache = importedMapInstance = initialCache;
+    }
+
+    /**
+     * Set entry by key
+     *
+     * @param {string} key
+     * @param {string|object} value
+     * @param {callback} cleanupFn
+     */
+    instance['set'] = function(key, value, cleanupFn = null) {
+        const existing = cache.get(key);
+        // If old entry exists, clean it up first
+        if (existing && existing.cleanup) {
+            existing.cleanup();
+        }
+
+        if (
+            /object/i.test(typeof(value))
+        ) {
+            value.createdAt = new Date();
+
+            if ( typeof(value.ttl) != 'undefined' ) {
+                // Converting Ms to secondes
+                var ttlMs = 1000 * ~~(value.ttl);
+                const timeout = setTimeout(() => {
+                    cache.delete(key);
+                }, ttlMs);
+
+                cache.set(key, {
+                    value,
+                    timeout,
+                    cleanup: cleanupFn || null
+                });
+            } else {
+                cache.set(key, {
+                    value,
+                    cleanup: cleanupFn || null
+                });
+            }
+        } else {
+            cache.set(key, {
+                value,
+                cleanup: cleanupFn || null
+            });
+        }
+
+
+
+        if (importedMapInstance) {
+            importedMapInstance = cache;
+        }
+    }
+
+    /**
+     * Get entry by key
+     *
+     * @param {string} key
+     *
+     * @return {object} entry
+     */
+    instance['get'] = function(key) {
+        const entry = cache.get(key);
+        return entry ? entry.value : undefined;
+    }
+
+    /**
+     * Check if cache has entry by key
+     *
+     * @param {string} key
+     * @returns
+     */
+    instance['has'] = function(key) {
+        return cache.has(key);
+    }
+
+    /**
+     * Delete entry by key
+     *
+     * @param {string} key
+     *
+     * @return {boolean} successStatus (true||false)
+     */
+    instance['delete'] = function(key) {
+        const entry = cache.get(key);
+        if (entry?.timeout) clearTimeout(entry.timeout);
+        if (entry) {
+            if (entry.cleanup) {
+                // Prevent resource leaks
+                entry.cleanup();
+            }
+
+            cache.delete(key);
+            if (importedMapInstance) {
+                importedMapInstance = cache;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Safely clear entire cache
+     *
+     */
+    instance['clear'] = function() {
+        for (const [key, entry] of cache.entries()) {
+            if (entry?.timeout) clearTimeout(entry.timeout);
+            if (entry.cleanup) {
+                try {
+                    entry.cleanup();
+                } catch (err) {
+                    console.error('Cache cleanup error for key:', key, err);
+                }
+            }
+        }
+        cache.clear();
+        if (importedMapInstance) {
+            importedMapInstance = cache;
+        }
+    }
+
+    /**
+     * Get cache stats
+     *
+     * @return stats
+     */
+    instance['size'] = function() {
+        return cache.size;
+    }
+
+    return instance;
+};
+
+if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
+    // Publish as node.js module
+    module.exports = Cache
+} else if ( typeof(define) === 'function' && define.amd) {
+    // Publish as AMD module
+    define(function() { return Cache })
+}

package/framework/v0.1.6-alpha.150/lib/collection/README.md

@@ -0,0 +1,5 @@
+## Debuging your test with nodeunit
+
+```tty
+ node --inspect-brk=6959 `which nodeunit` ./test/01-find.js
+```

package/framework/{v0.1.6-alpha.149 → v0.1.6-alpha.150}/lib/index.js

@@ -51,7 +51,8 @@ function Lib() {
         archiver        : _require('./archiver'),
         cmd             : _require('./cmd'),
         SessionStore    : _require('./session-store'),
-        SwigFilters     : _require('./swig-filters')
+        SwigFilters     : _require('./swig-filters'),
+        Cache           : _require('./cache'),
     };
 
     /**

package/package.json

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

package/framework/v0.1.6-alpha.149/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.149