gina 0.3.2-alpha.1 → 0.3.2

package/framework/v0.3.2/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js

@@ -0,0 +1,8 @@
+window.originalContext=null;
+window.onGinaLoaded=function(b){if(!b)return!1;if(b.isFrameworkLoaded)return!0;var e={bundle:'{{ page.environment.bundle }}',env:'{{ page.environment.env }}',envIsDev:/^true$/.test('{{ page.environment.envIsDev }}')?!0:!1,scope:'{{ page.environment.scope }}',scopeIsLocal:/^true$/.test('{{ page.environment.scopeIsLocal }}')?!0:!1,scopeIsProduction:/^true$/.test('{{ page.environment.scopeIsProduction }}')?!0:!1,isProxyHost:/^true$/.test('{{ page.environment.isProxyHost }}')?!0:!1,hostname:'{{ page.environment.hostname }}',
+routing:JSON.parse(decodeURIComponent('{{ page.environment.routing }}')),reverseRouting:JSON.parse(decodeURIComponent('{{ page.environment.reverseRouting }}')),version:'{{ page.environment.version }}',webroot:'{{ page.environment.webroot }}',protocol:'{{ page.environment.protocol }}'};if('undefined'!=typeof b.config.routing&&0<b.config.routing.count()&&'undefined'!=typeof b.config.reverseRouting&&!b.config.reverseRouting.count()||'undefined'!=typeof b.config.routing&&0<b.config.routing.count()&&'undefined'==
+typeof b.config.reverseRouting){var a=b.config.routing,d={};for(var f in a)if(/,/.test(a[f].url)){var h=a[f].url.split(/,/g),g=0;let c=h.length;for(;g<c;++g)d[h[g]]=f}else d[a[f].url]=f;b.config.reverseRouting=d}if('undefined'!=typeof b.config)for(let c in b.config)e[c]=b.config[c];b.config=e;/^true$/i.test(e.g)&&(e.proxyHost=b.config.proxyHost='{{ page.environment.proxyHost }}',e.proxyHostname=b.config.proxyHostname='{{ page.environment.proxyHostname }}');b.session={id:'{{ page.data.session.id }}',
+originalTimeout:'{{ page.data.session.timeout }}',createdAt:'{{ page.data.session.createdAt }}',lastModified:'{{ page.data.session.lastModified }}',expiresAt:null};b.session.__defineGetter__('timeout',function(){if(this.lastModified){this.lastModified&&'string'==typeof this.lastModified&&(this.lastModified=new Date(this.lastModified));this.createdAt&&'string'==typeof this.createdAt&&(this.createdAt=new Date(this.createdAt));this.originalTimeout&&'string'==typeof this.originalTimeout&&(this.originalTimeout=
+parseInt(this.originalTimeout));this.expiresAt=new Date((new Date(this.lastModified)).getTime()+this.originalTimeout);var c=this.expiresAt-new Date}else c=null;return c});b.session.timeout;b.config.getRouting=function(c){var k={},l=b.config.routing;if('undefined'==typeof c)return l;c=new RegExp('\\@'+c+String.fromCharCode(36));for(var m in l)c.test(m)&&(k[m]=l[m]);return 0<k.count()?k:null};window.GINA_ENV='{{ page.environment.env }}';window.GINA_ENV_IS_DEV=/^true$/i.test('{{ page.environment.envIsDev }}')?
+!0:!1;if('undefined'!=typeof location.search&&/debug=/i.test(location.search)||!location.search&&/\?/.test(location.href))a=(' '+location.search).slice(1),!a&&/\?/.test(location.href)&&(a=location.href.match(/\?.*/),Array.isArray(a)&&0<a.length&&(a=a[0])),(a=a.match(/debug=(true|false)/))&&(window.GINA_ENV_IS_DEV=b.config.envIsDev=/^true$/i.test(a[0].split(/=/)[1])?!0:!1),a=a=null;b.isFrameworkLoaded=!0;b.setOptions(e);try{b.forms=JSON.parse(decodeURIComponent('{{ page.environment.forms }}'))}catch(c){throw c;
+}a=null;a=document.head.getElementsByTagName('link');d=0;f=a.length;h=!1;for(g=RegExp('css/vendor/gina/gina.min.css');d<f;++d)if(g.test(a[d].href)){h=!0;break}g=f=d=a=null;h||(a=document.createElement('link'),a.href=e.webroot+'css/vendor/gina/gina.min.css',a.media='screen',a.rel='stylesheet',a.type='text/css',e=document.getElementsByTagName('head')[0],(d=e.getElementsByTagName('link'))&&'undefined'!=typeof d.length&&0<d.length?e.insertBefore(a,d[0]):e.appendChild(a),e=d=null);return!0};

package/framework/{v0.3.2-alpha.1 → v0.3.2}/core/connectors/couchbase/index.js

@@ -98,13 +98,28 @@ function Couchbase(conn, infos) {
      * extracted indexes. Patches `queryEntry.indexes` in-place once
      * the EXPLAIN result is available.
      *
-     * @param {object} conn - The Couchbase connection object (with `_cluster`)
+     * @param {object} conn - The Couchbase connection object. May have `_cluster`
+     *   directly (entity query path) or nested at `_scope._bucket._cluster` (bulk insert path).
      * @param {string} statement - The original N1QL statement (without EXPLAIN prefix)
      * @param {object} queryEntry - The QI entry to patch with index info
      * @param {object} queryOptions - Query options (for parameters)
      * @private
      */
     var explainForIndexes = function(conn, statement, queryEntry, queryOptions) {
+        // Resolve cluster from whichever conn shape we received:
+        // - entity query path: conn._cluster exists directly
+        // - bulk insert path: conn is a scope object, cluster is at conn._scope._bucket._cluster
+        var cluster = (conn._cluster)
+            ? conn._cluster
+            : (conn._scope && conn._scope._bucket && conn._scope._bucket._cluster)
+                ? conn._scope._bucket._cluster
+                : null;
+
+        if (!cluster || typeof(cluster.query) !== 'function') {
+            console.warn('[explainForIndexes] Cannot resolve cluster from conn — skipping EXPLAIN for: ' + statement.substring(0, 80));
+            return;
+        }
+
         // Mark as pending so we don't fire multiple EXPLAINs for the same statement
         _explainCache.set(statement, null);
 
@@ -113,18 +128,23 @@ function Couchbase(conn, infos) {
             parameters: queryOptions.parameters || []
         };
 
-        conn._cluster.query('EXPLAIN ' + statement, explainOpts)
-            .then(function(data) {
-                var plan = (data && data.rows && data.rows[0]) ? data.rows[0].plan || data.rows[0] : null;
-                var indexes = extractIndexes(plan);
-                _explainCache.set(statement, indexes);
-                // Patch the current query entry in-place (it's already in _devLog)
-                queryEntry.indexes = indexes;
-            })
-            .catch(function() {
-                // EXPLAIN failed — leave indexes as null (N/A badge)
-                _explainCache.set(statement, null);
-            });
+        try {
+            cluster.query('EXPLAIN ' + statement, explainOpts)
+                .then(function(data) {
+                    var plan = (data && data.rows && data.rows[0]) ? data.rows[0].plan || data.rows[0] : null;
+                    var indexes = extractIndexes(plan);
+                    _explainCache.set(statement, indexes);
+                    // Patch the current query entry in-place (it's already in _devLog)
+                    queryEntry.indexes = indexes;
+                })
+                .catch(function() {
+                    // EXPLAIN failed — leave indexes as null (N/A badge)
+                    _explainCache.set(statement, null);
+                });
+        } catch (_explainErr) {
+            console.warn('[explainForIndexes] ' + _explainErr.message);
+            _explainCache.set(statement, null);
+        }
     };
 
     /**

package/framework/{v0.3.2-alpha.1 → v0.3.2}/core/controller/controller.js

@@ -38,6 +38,13 @@ if (!process.gina._queryALS) {
     var { AsyncLocalStorage } = require('async_hooks');
     process.gina._queryALS = new AsyncLocalStorage();
 }
+// Inspector activation flag — when false, profiling (flow timeline, query log)
+// is skipped and JSON responses stay clean. Set to true when the Inspector SPA
+// is opened or an SSE client connects to /_gina/agent or /_gina/logs.
+// Lives on process.gina so it survives dev-mode cache busting of controller.js.
+if (typeof process.gina._inspectorActive === 'undefined') {
+    process.gina._inspectorActive = false;
+}
 var merge           = lib.merge;
 var inherits        = lib.inherits;
 var console         = lib.logger;
@@ -247,7 +254,11 @@ function SuperController(options) {
         // reuse it. AsyncLocalStorage.enterWith() binds the log to this request's
         // async context so connector queries always push to the correct array,
         // even when concurrent requests interleave.
-        if (_isDev) {
+        // Activated when the Inspector is open locally (_inspectorActive) OR when
+        // the request came from a cross-bundle self.query() call with the Inspector
+        // header (x-gina-inspector). This ensures QI captures queries on target
+        // bundles (e.g. coreapi) without always-on overhead.
+        if (_isDev && (process.gina._inspectorActive || (req.headers && req.headers['x-gina-inspector'] === 'true'))) {
             if (!req._devQueryLog) {
                 req._devQueryLog = [];
             }
@@ -2436,6 +2447,7 @@ if ( /^local$/i.test(process.env.NODE_SCOPE) ) {
         }
 
 
+        
         if ( typeof(data) != 'undefined' &&  data.count() > 0) {
 
             queryData = '?';
@@ -2570,6 +2582,12 @@ if ( /^local$/i.test(process.env.NODE_SCOPE) ) {
             options.headers['x-forwarded-proto'] = process.gina.PROXY_SCHEME;
         }
 
+        // #QI — propagate Inspector profiling to the target bundle so it
+        // captures queries and timeline entries for cross-bundle propagation.
+        if (_isDev && process.gina._inspectorActive) {
+            options.headers['x-gina-inspector'] = 'true';
+        }
+
         if ( ctx.gina.config.envConf[ctx.bundle][ctx.env].server.resolvers.length > 0 ) {
             var resolversColl = new Collection(ctx.gina.config.envConf[ctx.bundle][ctx.env].server.resolvers);
             options.nameservers = resolversColl.findOne({ scope: process.env.NODE_SCOPE}).nameservers;
@@ -4169,6 +4187,7 @@ if ( /^local$/i.test(process.env.NODE_SCOPE) ) {
         if (
             getContext('isProxyHost')
             && typeof(tmp.hostname) != 'undefined'
+            && typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
         ) {
             tmp.hostname    = process.gina.PROXY_HOSTNAME;
             tmp.host        = process.gina.PROXY_HOST;

package/framework/{v0.3.2-alpha.1 → v0.3.2}/core/controller/controller.render-json.js

@@ -207,17 +207,9 @@ module.exports = function renderJSON(jsonObj, deps) {
 
         console.info(request.method +' ['+ response.statusCode +'] '+ request.url);
 
-        // #QI — in dev mode, embed the request-scoped query log so upstream
-        // callers (dashboard calling coreapi via self.query()) can merge it
-        // into their own Inspector view. Stripped by the caller after extraction.
-        if (self.isCacheless() && local._queryLog && local._queryLog.length > 0) {
-            jsonObj.__ginaQueries = local._queryLog;
-        }
-
-        // #FI — in dev mode, push response-write + total timing so the Flow
-        // waterfall has closing bars for JSON responses. Pushed before the
-        // __ginaFlow sidecar injection so they travel with cross-bundle data.
-        if (self.isCacheless() && local._timeline) {
+        // #FI — push response-write + total timing to the timeline so the
+        // Flow waterfall has closing bars for JSON responses.
+        if (self.isCacheless() && process.gina._inspectorActive && local._timeline) {
             var _jsonRespEnd = Date.now();
             var _jsonRwStart = local._timeline._renderStart || local._timeline._actionStart || local._timeline.requestStart;
             local._timeline.entries.push({
@@ -238,9 +230,63 @@ module.exports = function renderJSON(jsonObj, deps) {
             });
         }
 
-        // #FI — in dev mode, embed the request-scoped timeline so upstream
-        // callers can merge it into their own Inspector Flow tab.
-        if (self.isCacheless() && local._timeline && local._timeline.entries.length > 0) {
+        // #INS — emit Inspector payload for JSON responses so the Inspector
+        // Data tab, Flow tab, and footer status bar work for APIs that only
+        // use self.renderJSON(). Gated on _inspectorActive to avoid overhead
+        // when the Inspector has not been opened.
+        if (self.isCacheless() && process.gina._inspectorActive) {
+            var _ctx = getContext('gina') || {};
+            var _conf = local.options.conf || {};
+            var _mem = process.memoryUsage();
+            var _env = {
+                'gina'           : _ctx.version || '',
+                'gina pid'       : getEnvVar('GINA_PID') || String(process.pid),
+                'nodejs'         : process.versions.node + ' ' + process.platform + ' ' + process.arch,
+                'engine'         : (_conf.server && _conf.server.engine) || '',
+                'env'            : process.env.NODE_ENV || '',
+                'envIsDev'       : self.isCacheless(),
+                'scope'          : process.env.NODE_SCOPE || '',
+                'bundle'         : _conf.bundle || '',
+                'project'        : _conf.projectName || '',
+                'protocol'       : (_conf.server && _conf.server.protocol) || '',
+                'scheme'         : (_conf.server && _conf.server.scheme) || '',
+                'port'           : (_conf.server && _conf.server.port) || '',
+                'webroot'        : (_conf.server && _conf.server.webroot) || '',
+                'memory heap'    : (_mem.heapUsed / 1024 / 1024).toFixed(2) + ' MB',
+                'memory allocated': (require('v8').getHeapStatistics().heap_size_limit / (1024 * 1024 * 1024)).toFixed(2) + ' GB',
+                'date.now'       : new Date().toISOString(),
+                'pid'            : process.pid
+            };
+            var _gdUser = {
+                environment : _env,
+                data        : jsonObj
+            };
+            if (local._queryLog && local._queryLog.length > 0) {
+                _gdUser.queries = local._queryLog;
+            }
+            if (local._timeline) {
+                _gdUser.flow = {
+                    requestStart : local._timeline.requestStart,
+                    entries      : local._timeline.entries
+                };
+            }
+            var __gdPayload = { gina: { environment: _env }, user: _gdUser };
+            self.serverInstance._lastGinaData = __gdPayload;
+            process.emit('inspector#data', __gdPayload);
+        }
+
+        // #QI — embed query log as a sidecar for cross-bundle propagation.
+        // When bundle A calls bundle B via self.query(), B's queries travel
+        // back as __ginaQueries in the JSON response body. A's query()
+        // callback extracts, merges into its own _queryLog, and deletes
+        // the field before the data reaches the controller action.
+        if (self.isCacheless() && local._queryLog && local._queryLog.length > 0) {
+            jsonObj.__ginaQueries = local._queryLog;
+        }
+
+        // #FI — embed timeline entries as a sidecar for cross-bundle flow
+        // propagation (mirrors __ginaQueries pattern).
+        if (self.isCacheless() && local._timeline && local._timeline.entries && local._timeline.entries.length > 0) {
             jsonObj.__ginaFlow = local._timeline.entries;
         }
 

package/framework/v0.3.2/core/deps/swig-1.4.2/dist/swig.min.js

@@ -0,0 +1,7 @@
+var swig=require('../index'),optimist=require('optimist'),fs=require('fs'),path=require('path'),filters=require('../lib/filters'),utils=require('../lib/utils'),uglify=require('uglify-js'),command,argv=optimist.usage('\n Usage:\n    $0 compile [files] [options]\n    $0 run [files] [options]\n    $0 render [files] [options]\n').describe({v:'Show the Swig version number.',o:'Output location.',h:'Show this help screen.',j:'Variable context as a JSON file.',c:'Variable context as a CommonJS-style file. Used only if option `j` is not provided.',
+m:'Minify compiled functions with uglify-js',filters:'Custom filters as a CommonJS-style file',tags:'Custom tags as a CommonJS-style file',options:"Customize Swig's Options from a CommonJS-style file",'wrap-start':'Template wrapper beginning for "compile".','wrap-end':'Template wrapper end for "compile".','method-name':'Method name to set template to and run from.'}).alias('v','version').alias('o','output').default('o','stdout').alias('h','help').alias('j','json').alias('c','context').alias('m','minify').default('wrap-start',
+'var tpl = ').default('wrap-end',';').default('method-name','tpl').check(function(a){if(!a.v){if(!a._.length)throw Error('');command=a._.shift();if('compile'!==command&&'render'!==command&&'run'!==command)throw Error('Unrecognized command "'+command+'". Use -h for help.');if('tpl'!==a['method-name']&&'var tpl ='!==a['wrap-start'])throw Error('Cannot use arguments "--method-name" and "--wrap-start" together.');'tpl'!==a['method-name']&&(a['wrap-start']='var '+a['method-name']+' = ')}}).argv,ctx={},
+out=function(a,b){console.log(b)},efn=function(){},anonymous,files,fn;argv.v&&(console.log(require('../package').version),process.exit(0));argv.j?ctx=JSON.parse(fs.readFileSync(argv.j,'utf8')):argv.c&&(ctx=require(argv.c));if('stdout'!==argv.o){argv.o+='/';argv.o=path.normalize(argv.o);try{fs.mkdirSync(argv.o)}catch(a){if(47!==a.errno)throw a;}out=function(a,b){a=path.basename(a);fs.writeFileSync(argv.o+a,b,{flags:'w'});console.log('Wrote',argv.o+a)}}
+argv.filters&&utils.each(require(path.resolve(argv.filters)),function(a,b){swig.setFilter(b,a)});argv.tags&&utils.each(require(path.resolve(argv.tags)),function(a,b){swig.setTag(b,a.parse,a.compile,a.ends,a.block)});argv.options&&swig.setDefaults(require(argv.options));
+switch(command){case 'compile':fn=function(a,b){b=swig.precompile(b,{filename:a,locals:ctx}).tpl.toString().replace('anonymous','');b=argv['wrap-start']+b+argv['wrap-end'];argv.m&&(b=uglify.minify(b,{fromString:!0}).code);out(a,b)};break;case 'run':fn=function(a,b){(function(){eval(b);var c=eval(argv['method-name']);out(a,c(swig,ctx,filters,utils,efn))})()};break;case 'render':fn=function(a,b){out(a,swig.render(b,{filename:a,locals:ctx}))}}
+argv._.forEach(function(a){var b=fs.readFileSync(a,'utf8');fn(a,b)});

package/framework/{v0.3.2-alpha.1 → v0.3.2}/core/gna.js

@@ -237,6 +237,11 @@ try {
     ginaPath = getPath('gina').core;
 }
 
+// Ensure gina.home is always registered (SQLite connector, session store)
+if ( !getPath('gina').home && typeof(getEnvVar) != 'undefined' ) {
+    setPath('gina.home', getEnvVar('GINA_HOMEDIR'));
+}
+
 if ( typeof(getEnvVar) == 'undefined') {
     console.debug('[ FRAMEWORK ][PROCESS ARGV] Process ARGV error ' + process.argv);
 }
@@ -1337,7 +1342,36 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                         e.emit('init', instance, middleware, conf);
                         //In case there is no user init.
                         if (!gna.initialized) {
-                            e.emit('complete', instance);
+                            // No onInitialize handler — still need to load models
+                            // before starting the server.
+                            try {
+                            var configuration = config.getInstance();
+                            modelUtil.loadAllModels(
+                                conf.bundles,
+                                configuration,
+                                env,
+                                function() {
+                                    joinContext(conf.contexts);
+                                    gna.getConfig = function(name){
+                                        var tmp = null;
+                                        if ( typeof(name) != 'undefined' ) {
+                                            try {
+                                                tmp = JSON.clone(conf.content[name])
+                                            } catch (err) {
+                                                console.error('[ FRAMEWORK ] ', err.stack);
+                                                return undefined
+                                            }
+                                        } else {
+                                            tmp = JSON.clone(conf)
+                                        }
+                                        return tmp
+                                    };
+                                    e.emit('complete', instance);
+                                });
+                            } catch(loadErr) {
+                                console.error('[ FRAMEWORK ] Model loading failed: ' + (loadErr.stack||loadErr.message));
+                                e.emit('complete', instance);
+                            }
                         }
                         // -- EO
 

package/framework/{v0.3.2-alpha.1 → v0.3.2}/core/server.isaac.js

@@ -494,7 +494,8 @@ function ServerEngineClass(options) {
 
             request.originalUrl = request.url;
             // #FI — dev-mode request timeline for Inspector Flow tab
-            if (isCacheless) {
+            // Only initialized when the Inspector has been opened (process.gina._inspectorActive)
+            if (isCacheless && process.gina._inspectorActive) {
                 request._devTimeline = { requestStart: Date.now(), entries: [] };
             }
             // From the original
@@ -607,37 +608,45 @@ function ServerEngineClass(options) {
                 && request.method.toUpperCase() === 'GET'
                 && /\/_gina\/inspector(\/.*)?$/.test(request.url)
             ) {
+                // Activate profiling on first Inspector access — one-way flag,
+                // stays true until bundle restart. QI (controller.js:257) gates
+                // on this; it must be true before any request is processed.
+                if (!process.gina._inspectorActive) process.gina._inspectorActive = true;
                 var _inspBase = __dirname + '/asset/plugin/dist/vendor/gina/inspector';
                 var _inspPath = request.url.replace(/^.*\/_gina\/inspector\/?/, '').split('?')[0];
                 if (!_inspPath || _inspPath === '') _inspPath = 'index.html';
 
                 var _inspMime = {
-                    'html': 'text/html; charset=utf8',
-                    'js':   'application/javascript; charset=utf8',
-                    'css':  'text/css; charset=utf8',
-                    'svg':  'image/svg+xml'
+                    'html':  'text/html; charset=utf8',
+                    'js':    'application/javascript; charset=utf8',
+                    'css':   'text/css; charset=utf8',
+                    'svg':   'image/svg+xml',
+                    'woff2': 'font/woff2',
+                    'woff':  'font/woff'
                 };
                 var _inspExt  = _inspPath.split('.').pop();
                 var _inspFile = _(_inspBase + '/' + _inspPath, true);
 
                 if (fs.existsSync(_inspFile)) {
+                    var _inspBinary = /^(woff2?|png|ico|gif|jpe?g)$/.test(_inspExt);
                     var _inspHeaders = {
                         'content-type': _inspMime[_inspExt] || 'application/octet-stream',
                         'cache-control': 'no-cache, no-store, must-revalidate',
                         'x-content-type-options': 'nosniff',
                         'X-Powered-By': 'Gina/' + GINA_VERSION
                     };
+                    var _inspData = fs.readFileSync(_inspFile, _inspBinary ? undefined : 'utf8');
 
                     // HTTP/2
                     if (response.stream) {
                         response.stream.respond({ ':status': 200, ..._inspHeaders });
-                        return response.stream.end(fs.readFileSync(_inspFile, 'utf8'));
+                        return response.stream.end(_inspData);
                     }
 
                     // HTTP/1.1
                     response.writeHead(200, _inspHeaders);
                     console.info(request.method + ' [200] ' + request.url);
-                    return response.end(fs.readFileSync(_inspFile, 'utf8'));
+                    return response.end(_inspData);
                 }
                 // Fall through to 404 if file not found
             }
@@ -648,6 +657,7 @@ function ServerEngineClass(options) {
                 && request.method.toUpperCase() === 'GET'
                 && /\/_gina\/logs$/.test(request.url)
             ) {
+                if (!process.gina._inspectorActive) process.gina._inspectorActive = true;
                 var _ansiRe = /\x1B\[\d+m/g;
 
                 var _sseHeaders = {
@@ -706,6 +716,7 @@ function ServerEngineClass(options) {
                 && request.method.toUpperCase() === 'GET'
                 && /\/_gina\/agent$/.test(request.url)
             ) {
+                if (!process.gina._inspectorActive) process.gina._inspectorActive = true;
                 var _agAnsiRe = /\x1B\[\d+m/g;
 
                 var _agHeaders = {
@@ -733,11 +744,22 @@ function ServerEngineClass(options) {
 
                 _agWrite(':ok\n\n');
 
-                // Send current snapshot immediately if available
+                // Send current snapshot immediately if available; otherwise
+                // send a lightweight "connected" frame so the Inspector shows
+                // the bundle identity without waiting for the first request.
                 if (server._lastGinaData) {
                     try {
                         _agWrite('event: data\ndata: ' + JSON.stringify(server._lastGinaData) + '\n\n');
                     } catch (e) {}
+                } else {
+                    try {
+                        var _initEnv = {
+                            bundle : options.bundle || '',
+                            env    : env || ''
+                        };
+                        var _initPayload = { gina: { environment: _initEnv }, user: { environment: _initEnv } };
+                        _agWrite('event: data\ndata: ' + JSON.stringify(_initPayload) + '\n\n');
+                    } catch (e) {}
                 }
 
                 // Data updates — emitted by render-swig.js on every HTML render

package/framework/{v0.3.2-alpha.1 → v0.3.2}/core/server.js

@@ -2257,7 +2257,8 @@ function Server(options) {
         self.instance.all('*', function onInstance(request, response, next) {
 
             // #FI — dev-mode request timeline for Inspector Flow tab
-            if (self.isCacheless()) {
+            // Only initialized when the Inspector has been opened (process.gina._inspectorActive)
+            if (self.isCacheless() && process.gina._inspectorActive) {
                 request._devTimeline = { requestStart: Date.now(), entries: [] };
             }
 
@@ -2337,25 +2338,32 @@ function Server(options) {
                 && request.method.toUpperCase() === 'GET'
                 && /\/_gina\/inspector(\/.*)?$/.test(request.url)
             ) {
+                // Activate profiling on first Inspector access — one-way flag,
+                // stays true until bundle restart. QI (controller.js:257) gates
+                // on this; it must be true before any request is processed.
+                if (!process.gina._inspectorActive) process.gina._inspectorActive = true;
                 var _bmBase = __dirname + '/asset/plugin/dist/vendor/gina/inspector';
                 var _bmPath = request.url.replace(/^.*\/_gina\/inspector\/?/, '').split('?')[0];
                 if (!_bmPath || _bmPath === '') _bmPath = 'index.html';
 
                 var _bmMime = {
-                    'html': 'text/html; charset=utf8',
-                    'js':   'application/javascript; charset=utf8',
-                    'css':  'text/css; charset=utf8',
-                    'svg':  'image/svg+xml'
+                    'html':  'text/html; charset=utf8',
+                    'js':    'application/javascript; charset=utf8',
+                    'css':   'text/css; charset=utf8',
+                    'svg':   'image/svg+xml',
+                    'woff2': 'font/woff2',
+                    'woff':  'font/woff'
                 };
                 var _bmExt = _bmPath.split('.').pop();
                 var _bmFile = _(_bmBase + '/' + _bmPath, true);
 
                 if (fs.existsSync(_bmFile)) {
+                    var _bmBinary = /^(woff2?|png|ico|gif|jpe?g)$/.test(_bmExt);
                     response.setHeader('content-type', _bmMime[_bmExt] || 'application/octet-stream');
                     response.setHeader('cache-control', 'no-cache, no-store, must-revalidate');
                     response.setHeader('x-content-type-options', 'nosniff');
                     console.info(request.method + ' [200] ' + request.url);
-                    return response.end(fs.readFileSync(_bmFile, 'utf8'));
+                    return response.end(fs.readFileSync(_bmFile, _bmBinary ? undefined : 'utf8'));
                 }
                 // Fall through to 404 if file not found
             }
@@ -2366,6 +2374,7 @@ function Server(options) {
                 && request.method.toUpperCase() === 'GET'
                 && /\/_gina\/logs$/.test(request.url)
             ) {
+                if (!process.gina._inspectorActive) process.gina._inspectorActive = true;
                 var _ansiRe = /\x1B\[\d+m/g;
 
                 response.setHeader('content-type', 'text/event-stream; charset=utf-8');
@@ -2410,6 +2419,7 @@ function Server(options) {
                 && request.method.toUpperCase() === 'GET'
                 && /\/_gina\/agent$/.test(request.url)
             ) {
+                if (!process.gina._inspectorActive) process.gina._inspectorActive = true;
                 var _agAnsiRe = /\x1B\[\d+m/g;
 
                 response.setHeader('content-type', 'text/event-stream; charset=utf-8');
@@ -2419,11 +2429,22 @@ function Server(options) {
                 response.setHeader('x-content-type-options', 'nosniff');
                 response.write(':ok\n\n');
 
-                // Send current snapshot immediately if available
+                // Send current snapshot immediately if available; otherwise
+                // send a lightweight "connected" frame so the Inspector shows
+                // the bundle identity without waiting for the first request.
                 if (self.instance && self.instance._lastGinaData) {
                     try {
                         response.write('event: data\ndata: ' + JSON.stringify(self.instance._lastGinaData) + '\n\n');
                     } catch (e) {}
+                } else {
+                    try {
+                        var _initEnv = {
+                            bundle : self.appName || '',
+                            env    : self.env || ''
+                        };
+                        var _initPayload = { gina: { environment: _initEnv }, user: { environment: _initEnv } };
+                        response.write('event: data\ndata: ' + JSON.stringify(_initPayload) + '\n\n');
+                    } catch (e) {}
                 }
 
                 // Data updates — emitted by render-swig.js on every HTML render
@@ -2908,6 +2929,8 @@ function Server(options) {
      */
     var processRequestData = function(request, response, next) {
 
+
+
         var bodyStr = null, obj = null, exception = null;
         // to compare with /core/controller/controller.js -> getParams()
         switch( request.method.toLowerCase() ) {
@@ -3091,6 +3114,7 @@ function Server(options) {
 
                             obj = formatDataFromString(bodyStr);
 
+
                             if ( typeof(obj) != 'undefined' && obj.count() == 0 && bodyStr.length > 1 ) {
                                 try {
                                     request.put = merge(request.put, obj);
@@ -3122,8 +3146,10 @@ function Server(options) {
                 }
 
                 if ( obj && typeof(obj) != 'undefined' && obj.count() > 0 ) {
-                    // still need this to allow compatibility with express & connect middlewares
+                    
+// still need this to allow compatibility with express & connect middlewares
                     request.body = request.put = merge(request.put, obj);
+
                 }
 
 
@@ -3672,6 +3698,7 @@ function Server(options) {
         var _origParams     = Object.assign({}, req.params);
         var _origReqMethod  = (typeof(req[_reqMethodKey]) != "undefined") ? Object.assign({}, req[_reqMethodKey]) : undefined;
 
+
         out:
             for (let name in routing) {
                 // skip non-object entries (e.g. $schema annotations in routing.json)
@@ -3700,7 +3727,7 @@ function Server(options) {
                 // matching; leftover values cause parseRouting lines 396-407 to inject
                 // phantom segments, compounding work on each subsequent compareUrls call.
                 req.params = Object.assign({}, _origParams);
-                delete req[_reqMethodKey];
+                req[_reqMethodKey] = _origReqMethod ? Object.assign({}, _origReqMethod) : {};
 
                 // Updating hostname
                 // if (
@@ -3869,6 +3896,20 @@ function Server(options) {
         // Restore req[method] if deleted during route matching (#fix: routes without URL params)
         if (typeof(req[_reqMethodKey]) == "undefined") {
             req[_reqMethodKey] = _origReqMethod || {};
+        } else if (
+            _origReqMethod && typeof(_origReqMethod) == "object"
+            && ["get", "put", "post", "patch", "delete"].indexOf(_reqMethodKey) > -1
+            && _origReqMethod.count() > 0
+        ) {
+            // compareUrls recreates req[method] with only URL params, discarding
+            // body data parsed by processRequestData (or query params for GET). Merge back in.
+            // URL params (in req[method]) take precedence over original values.
+            var _bodyKeys = Object.keys(_origReqMethod);
+            for (var _bk = 0; _bk < _bodyKeys.length; ++_bk) {
+                if (typeof(req[_reqMethodKey][_bodyKeys[_bk]]) == "undefined") {
+                    req[_reqMethodKey][_bodyKeys[_bk]] = _origReqMethod[_bodyKeys[_bk]];
+                }
+            }
         }
 
         // #FI — route matching end

package/framework/{v0.3.2-alpha.1 → v0.3.2}/helpers/context.js

@@ -204,6 +204,7 @@ function ContextHelper(contexts) {
         var frameworkPath = getEnvVar('GINA_FRAMEWORK_DIR');
         setPath('framework', frameworkPath);
         setPath('gina.core', getEnvVar('GINA_CORE'));
+        setPath('gina.home', getEnvVar('GINA_HOMEDIR'));
         setPath('gina.lib', _(frameworkPath +'/lib'));
         setPath('gina.helpers', _(frameworkPath +'/helpers'));
         setPath( 'node', _(process.argv[0]), true);

package/framework/{v0.3.2-alpha.1 → v0.3.2}/lib/cmd/bundle/add.js

@@ -345,7 +345,6 @@ function Add(opt, cmd) {
             "_comment"    : "Your comment goes here.",
             "version"     : version,
             "tag"         : ( version.split('.') ).join(''),
-            "gina_version": getEnvVar('GINA_VERSION'),
             "src"         : "src/" + local.bundle,
             "link"        : "bundles/"+ local.bundle,
             "releases"    : {}

package/framework/{v0.3.2-alpha.1 → v0.3.2}/lib/cmd/bundle/start.js

@@ -144,7 +144,7 @@ function Start(opt, cmd) {
             nodeModulesPathObj.existsSync()
             && nodeModulesContentArr.length == 1
             && nodeModulesContentArr[0] == 'gina'
-            && typeof(pack.dependencies) != 'object'
+            && typeof(pack.dependencies) == 'object'
             && pack.dependencies.count() > 0
         ) {
             if (scope == "local")
@@ -266,6 +266,16 @@ function Start(opt, cmd) {
 
         var bundle = (isBulkStart) ? self.bundles[bundleIndex] : self.name;
         // terminal.debug('bundle -> ', bundle);
+
+        var msg = null;
+        if ( !isBulkStart && !isDefined('bundle', bundle) ) {
+            msg = 'Bundle [ '+ bundle +' ] is not registered inside `@'+ self.projectName +'`.\nDid you run `gina bundle:add '+ bundle +' @'+ self.projectName +'` first?';
+            terminal.error(msg);
+
+            opt.msg = msg;
+            return end(opt, cmd, isBulkStart, bundleIndex, true)
+        }
+
         var env = ( typeof(self.bundlesByProject[self.projectName][bundle].def_env) != 'undefined') ? self.bundlesByProject[self.projectName][bundle].def_env : self.defaultEnv;
         var scope = ( typeof(self.bundlesByProject[self.projectName][bundle].def_scope) != 'undefined') ? self.bundlesByProject[self.projectName][bundle].def_scpoe : self.defaultScope;
         // terminal.debug('env -> ', env);
@@ -276,18 +286,6 @@ function Start(opt, cmd) {
         var bundlePort = self.portsReverseData[bundle + '@' + self.projectName][env][protocol][scheme];
         // terminal.debug('port -> ', bundlePort);
 
-        var msg = null;
-        if ( !isBulkStart && !isDefined('bundle', bundle) ) {
-            msg = 'Bundle [ '+ bundle +' ] is not registered inside `@'+ self.projectName +'`';
-            terminal.error(msg);
-            // opt.client.write(msg);
-            // // CMD exit
-            // opt.client.emit('end');
-
-            opt.msg = msg;
-            return end(opt, cmd, isBulkStart, bundleIndex, true)
-        }
-
         var isStarting  = false
             , params    = null
             , index     = null

package/framework/{v0.3.2-alpha.1 → v0.3.2}/lib/cmd/framework/restart.js

@@ -99,7 +99,16 @@ function Restart(opt, cmd) {
                 console.debug('out => ', out);
                 // TODO - retrieve running bundles with its options & restart
             } catch (err) {
-                throw err;
+                // gina start may exit non-zero when Node.js writes benign
+                // warnings (e.g., ExperimentalWarning) to stderr while the
+                // daemon actually started in the background.
+                // Check for the PID file before treating this as a failure.
+                var pidFile = _(GINA_RUNDIR + '/gina-v' + self.version + '.pid', true);
+                if ( fs.existsSync(pidFile) ) {
+                    console.debug('Framework v'+ self.version +' restarted successfully');
+                } else {
+                    throw err;
+                }
             }
         }, 100);