gina 0.4.5 → 0.4.6

package/framework/{v0.4.5 → v0.4.6}/lib/cache/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/framework/link.js

@@ -98,11 +98,22 @@ var console        = lib.logger;
                     return end(err, 'error')
                 }
 
-                console.debug('[link] Running: gina link-node-modules @'+self.projectName);
-                err = execSync('$(which gina) link-node-modules @'+self.projectName);
-                if (err instanceof Error) {
-                    console.warn('[link] ', err.stack);
-                    return end(err, 'error')
+                // was: err = execSync('$(which gina) link-node-modules @'+self.projectName);
+                // A PATH-resolved binary is not guaranteed to exist (repo checkout,
+                // non-global install) and may be a different install than the one
+                // running this command — invoke the running install's own CLI instead
+                // (same rationale as the `source` resolution below). Note execSync
+                // THROWS on failure and never returns an Error, so the old
+                // `instanceof Error` check was dead code; wrap in try/catch and
+                // route the failure through end().
+                var cli = require('path').resolve(__dirname, '../../../../..', 'bin/cli');
+                console.debug('[link] Running: '+ process.execPath +' '+ cli +' link-node-modules @'+ self.projectName);
+                try {
+                    execSync('"'+ process.execPath +'" "'+ cli +'" link-node-modules @'+ self.projectName);
+                } catch (linkErr) {
+                    var errOutput = (linkErr.stderr) ? linkErr.stderr.toString().trim() : (linkErr.message || linkErr.stack);
+                    console.warn('[link] '+ errOutput);
+                    return end(new Error(errOutput), 'error')
                 }
             }
             destination = new _(destination.toString() +'/gina', true);

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/framework/msg.json

@@ -8,7 +8,7 @@
         "0" : "basic.help.txt",
         "1" : "no argument found",
         "2" : "illegal option",
-        "4" : "Gina I/O v%version%\nMiddleware: %middleware%\n%copyright%",
+        "4" : "Gina I/O v%version%\nMiddleware: %middleware%\n%engine%%copyright%",
         "5" : "Gina I/O Framework not found! Please visite https://gina.io/ to get the latest version or try to run : npm install gina"
     },
     "app" : {

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/framework/restart.js

@@ -6,6 +6,11 @@ const util = require('util');
 var CmdHelper   = require('./../helper');
 // const { start } = require('repl');
 var console     = lib.logger;
+// Self-resolved daemon wrapper — never PATH-resolve our own binary: the PATH
+// may carry no gina at all (repo checkout, non-global install) or a different
+// install than the one running this command. bin/gina (not bin/cli) is required
+// here so `start` keeps its detached-daemon spawn semantics.
+var ginaBin     = require('path').resolve(__dirname, '../../../../..', 'bin/gina');
 /**
  * @module gina/lib/cmd/framework/restart
  */
@@ -95,7 +100,8 @@ function Restart(opt, cmd) {
             // TODO - retrieve & add `opt`
             var out = null;
             try {
-                out = execSync('$(which gina) start @'+self.version).toString();
+                // was: out = execSync('$(which gina) start @'+self.version).toString();
+                out = execSync('"'+ process.execPath +'" "'+ ginaBin +'" start @'+self.version).toString();
                 console.debug('out => ', out);
                 // TODO - retrieve running bundles with its options & restart
             } catch (err) {
@@ -122,7 +128,8 @@ function Restart(opt, cmd) {
     var stop = function() {
         var out = null;
         try {
-            out = execSync('$(which gina) stop @'+self.version).toString();
+            // was: out = execSync('$(which gina) stop @'+self.version).toString();
+            out = execSync('"'+ process.execPath +'" "'+ ginaBin +'" stop @'+self.version).toString();
             console.debug('out => ', out);
         } catch (err) {
             throw err;
@@ -187,7 +194,8 @@ function Restart(opt, cmd) {
                 continue;
             }
             // process.stdout.write('\ngina bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @') + '\n');
-            execSync('$(which gina) bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @'));
+            // was: execSync('$(which gina) bundle:restart '+ ...) — PATH-resolved self-invocation
+            execSync('"'+ process.execPath +'" "'+ ginaBin +'" bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @'));
         }
     }
 

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/framework/start.js

@@ -71,7 +71,11 @@ function Start(opt){
                 continue;
             }
             // process.stdout.write('\ngina bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @') + '\n');
-            execSync('$(which gina) bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @'));
+            // was: execSync('$(which gina) bundle:restart '+ ...) — PATH-resolved self-invocation;
+            // bin/gina is resolved from this file's own location instead (the PATH may carry
+            // no gina or a different install than the one running this command).
+            var ginaBin = require('path').resolve(__dirname, '../../../../..', 'bin/gina');
+            execSync('"'+ process.execPath +'" "'+ ginaBin +'" bundle:restart '+ file.replace(/\.pid$/, '').replace(/\@/, ' @'));
         }
     }
 

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/framework/version.js

@@ -5,17 +5,21 @@ var console = lib.logger;
  * @module gina/lib/cmd/framework/version
  */
 /**
- * Prints the installed Gina framework version, platform, architecture, and middleware.
+ * Prints the installed Gina framework version, platform, architecture, middleware,
+ * and — when the engine package is resolvable — the bundled template engine name and
+ * version (swig by default). The template-engine line is omitted when the engine
+ * package cannot be read (e.g. a framework directory not yet `npm install`-ed),
+ * satisfying the "when available" contract.
  *
  * Usage:
  *  gina framework:version
  *  gina version
- *  gina version --short=true   (prints version number only)
+ *  gina version --short=true   (prints version number only; no template-engine line)
  *
  * @class Version
  * @constructor
  * @param {object} opt - Parsed command-line options
- * @param {string} [opt.frameworkPath] - Absolute path to the framework directory
+ * @param {string} [opt.frameworkPath] - Absolute path to the framework directory (used to read MIDDLEWARE and the bundled template engine's package.json)
  * @param {string} [opt.pack] - Path to package.json for reading the copyright field
  */
 function Version(opt){
@@ -41,6 +45,21 @@ function Version(opt){
             default:
                 break;
         }
+        // Template engine in use — read the framework-bundled engine package (swig by
+        // default, declared in framework/v<version>/package.json). Read defensively so a
+        // framework directory without the engine package installed (e.g. a fresh clone
+        // before `npm install`) simply omits the line, satisfying the "when available"
+        // contract rather than crashing the banner.
+        var engine = '';
+        try {
+            var enginePack = JSON.parse( fs.readFileSync(_( opt.frameworkPath + '/node_modules/@rhinostone/swig/package.json')).toString() );
+            if ( enginePack && enginePack.name && enginePack.version ) {
+                engine = enginePack.name + '@' + enginePack.version;
+            }
+        } catch (engineErr) {
+            engine = '';
+        }
+
         var vers = "",
             short = ( typeof(process.argv[3]) != 'undefined') ? process.argv[3]: false,
             msg = require('./msg.json'),
@@ -49,12 +68,14 @@ function Version(opt){
                 "platform"      : process.platform,
                 "arch"          : arch,
                 "middleware"    : fs.readFileSync(_( opt.frameworkPath + '/MIDDLEWARE')).toString() || 'none',
+                "engine"        : engine,
                 "copyright"     : require(opt.pack).copyright
             };
 
         vers = msg.basic[4]
             .replace(/%version%/, version.number +' '+ version.platform +' '+ version.arch + ' (MIT)')
             .replace(/%middleware%/, version.middleware)
+            .replace(/%engine%/, version.engine ? ('Template engine: ' + version.engine + '\n') : '')
             .replace(/%copyright%/, version.copyright);
 
         if (typeof(GINA_VERSION) != "undefined") {

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/helper.js

@@ -613,6 +613,9 @@ function CmdHelper(cmd, client, debug) {
      * Reads all framework config files (main.json, projects.json, manifest.json,
      * env.json, ports.json, ports.reverse.json) fresh from disk (no require cache).
      * Populates cmd with scopes, envs, protocols, schemes, port maps, and bundle lists.
+     * A registered project whose directory exists but whose manifest.json is missing
+     * (a stale ~/.gina/projects.json entry) is warned and skipped (#B24) rather than
+     * aborting the whole command.
      * Also links node_modules and gina when running start/stop/restart tasks in global mode.
      * Assigns itself to the global `loadAssets`.
      *
@@ -1109,17 +1112,24 @@ function CmdHelper(cmd, client, debug) {
                     ||
                     /bundle\:(restart|start|stop)$/.test(cmd.task)
                 ) {
-                    console.info('[helper] Running: gina link-node-modules @'+cmd.projectName +cmd.paramsStringified);
-                    err = execSync('$(which gina) link-node-modules @'+cmd.projectName +cmd.paramsStringified);// +' --inspect-gina'
-                    if (err instanceof Error) {
-                        console.error(err.message || err.stack);
-                        return exit(err.message || err.stack);
+                    // was: err = execSync('$(which gina) link-node-modules @'+cmd.projectName +cmd.paramsStringified);
+                    // A PATH-resolved binary is not guaranteed to exist (repo checkout,
+                    // non-global install) and execSync THROWS on failure rather than
+                    // returning an Error (the old `instanceof Error` check was dead
+                    // code) — invoke the running install's own CLI instead.
+                    var selfCli = require('path').resolve(__dirname, '../../../..', 'bin/cli');
+                    console.info('[helper] Running: '+ process.execPath +' '+ selfCli +' link-node-modules @'+cmd.projectName +cmd.paramsStringified);
+                    try {
+                        execSync('"'+ process.execPath +'" "'+ selfCli +'" link-node-modules @'+cmd.projectName +cmd.paramsStringified);// +' --inspect-gina'
+                    } catch (linkErr) {
+                        var linkErrOutput = (linkErr.stderr) ? linkErr.stderr.toString().trim() : (linkErr.message || linkErr.stack);
+                        console.error(linkErrOutput);
+                        return exit(linkErrOutput);
                     }
 
-                    console.info('[helper] Running: $(which gina) link @'+cmd.projectName +cmd.paramsStringified);
-                    // let ginaBin = execSync('echo $(which gina)').toString().trim();
+                    console.info('[helper] Running: '+ process.execPath +' '+ selfCli +' link @'+cmd.projectName +cmd.paramsStringified);
                     try {
-                        console.debug(execSync('$(which gina) link @'+cmd.projectName +cmd.paramsStringified).toString().trim());// +' --inspect-gina'
+                        console.debug(execSync('"'+ process.execPath +'" "'+ selfCli +'" link @'+cmd.projectName +cmd.paramsStringified).toString().trim());// +' --inspect-gina'
                     } catch (err) {
                         var errOutput = (err.stderr) ? err.stderr.toString().trim() : (err.message || err.stack);
                         console.emerg(errOutput);
@@ -1257,6 +1267,11 @@ function CmdHelper(cmd, client, debug) {
                 cmd.projects[project].exists    = true;
                 if ( !new _(projectPropertiesPath).existsSync() ) {
                     console.error('`'+ projectPropertiesPath +'` not found ! Maybe, you can try to remove the project reference by hand by editing: `'+ _(GINA_HOMEDIR + '/projects.json') +'`')
+                    // #B24: skip this stale project (dir present, manifest.json gone) instead of
+                    // falling through to the requireJSON(...).bundles below, which process-exits on
+                    // ENOENT — aborting every offline asset command when ANY one registered project
+                    // is stale. bundlesByProject[project] stays {} (pre-set above); exists stays true.
+                    continue;
                 }
 
                 cmd.bundlesByProject[project]   = (cmd.bundlesByProject[project].count() > 0) ? cmd.bundlesByProject[project] : requireJSON(projectPropertiesPath).bundles;
@@ -1377,7 +1392,11 @@ function CmdHelper(cmd, client, debug) {
                         }
                     }
 
-                    cmd.bundlesByProject[cmd.projectName][bundle].def_env = (cmd.params.env) ? cmd.params.env : cmd.defaultEnv; // by default
+                    // #B27: index by the loop variable `project` — every other write in this
+                    // double-loop does. With the old cmd.projectName index, the loop reaching a
+                    // project other than the freshly-added @alias (which has no bundlesByProject
+                    // entry yet) dereferenced undefined and hard-crashed `gina project:add`.
+                    cmd.bundlesByProject[project][bundle].def_env = (cmd.params.env) ? cmd.params.env : cmd.defaultEnv; // by default
 
 
                 } else {

package/framework/{v0.4.5 → v0.4.6}/lib/cmd/project/add.js

@@ -887,12 +887,22 @@ function Add(opt, cmd) {
     }
 
     /**
-     * Runs `gina link @<project>` via Shell to create the node_modules/gina symlink
-     * inside the project directory.
+     * Creates the project's `node_modules/gina` symlink by invoking the running
+     * install's own CLI: `<node> <gina root>/bin/cli link @<project>`.
+     *
+     * The CLI path is resolved from this file's location — NOT from a PATH-resolved
+     * `gina` binary: the PATH may carry no gina at all (a repo checkout where
+     * `npm install --ignore-scripts` skipped the bin linking) or a different install
+     * than the one executing `project:add`. Same rationale as framework/link.js,
+     * which resolves the symlink source from its own location.
+     *
+     * Success is verified on the actual postcondition — the symlink exists — because
+     * the Shell helper reports any stderr output as an error even when the command
+     * succeeded.
      *
      * @inner
      * @private
-     * @param {function} onError - Called with an Error when the link command fails
+     * @param {function} onError - Called with an Error when the gina symlink is still missing after the link attempt
      * @param {function} onSuccess - Called with no arguments on success
      */
     var linkGina = function ( onError, onSuccess ) {
@@ -902,19 +912,25 @@ function Add(opt, cmd) {
         npm.setOptions({ chdir: self.projectLocation });
         npm
             // .run('npm link gina', true)
-            .run('gina link @'+ self.projectName, true)
+            // was: .run('gina link @'+ self.projectName, true)
+            // A PATH-resolved binary is not guaranteed to exist (repo checkout,
+            // non-global install) and its failure was silently swallowed — the
+            // scaffolded bundle then crashed at boot with MODULE_NOT_FOUND on its
+            // framework require. Invoke the running install's own CLI instead.
+            .run([ process.execPath, require('path').resolve(__dirname, '../../../../..', 'bin/cli'), 'link', '@'+ self.projectName ], true)
             .onComplete(function (err, data) {
-                if (err) {
-                    if ( typeof(onSuccess) != 'undefined' ) {
-                        onSuccess(err);
-                    } else {
-                        console.error(err.stack);
-                    }
 
-                } else {
-                    if ( typeof(onSuccess) != 'undefined' )
-                        onSuccess()
+                var ginaModule = _(self.projectLocation + '/node_modules/gina', true);
+                if ( !fs.existsSync(ginaModule) ) {
+                    err = new Error('Could not create the gina symlink in [ '+ self.projectLocation +'/node_modules ]'+ ( err ? '\n'+ ( err.stack || err ) : '' ));
+                    if ( typeof(onError) != 'undefined' ) {
+                        return onError(err);
+                    }
+                    return console.error(err.stack);
                 }
+
+                if ( typeof(onSuccess) != 'undefined' )
+                    onSuccess()
             })
     }
 

package/framework/{v0.4.5 → v0.4.6}/lib/collection/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/cron/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/domain/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/index.js

@@ -138,6 +138,13 @@ function Lib() {
         // (getUrl, getWebroot, length, nl2br, addHours, addDays, addYears).
         // Registered via env.addFilter() in render-nunjucks.js per request.
         nunjucksFilters: _require('./nunjucks-filters'),
+        // #TPL1 — Async template-loader extension point. Builds a built-in
+        // loader (memory; http in a later slice) from its flat
+        // settings.template.<engine>.loader config and wraps it with a
+        // CVE-2023-25345 segment-guard. Consumed by initSwigEngine (startup
+        // build + validation) and controller.render-swig-async.js. Pure factory
+        // (no singleton state), so _require (hot-reloadable) is safe.
+        templateLoaders : _require('./template-loaders'),
         // #AI8b — MCP server primitives (JSON-RPC 2.0 framing, lifecycle,
         // method handlers). Transport-agnostic; wired to stdio by bundle:mcp-start.
         mcpServer       : _require('./mcp-server'),

package/framework/{v0.4.5 → v0.4.6}/lib/inherits/package.json

@@ -21,9 +21,6 @@
   },
   "copyright" : "Copyright (c) 2009-2026 Rhinostone <contact@gina.io>",
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/logger/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/merge/package.json

@@ -13,9 +13,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/model.js

@@ -253,6 +253,23 @@ function ModelUtil() {
                     }
                 }
 
+                // #B29 — a connectors.json with no actual connector entries (only a
+                // `$schema` annotation — the `bundle:add` scaffold default — or an empty
+                // `{}`) leaves `models` a truthy object with zero object-valued keys, so
+                // the guard above entered this connector branch. The connector loop below
+                // `continue`s past every non-object key, so `done()` (the sole `cb()`
+                // caller) is never reached and the boot stalls before `.listen()`. Treat a
+                // zero-connector config like the no-connectors `else` branch: advance to
+                // the next bundle (or finish), firing the completion callback.
+                if (_connectorCount === 0) {
+                    if (b < bundles.length-1) {
+                        loadModel(b+1, bundles, configuration, env, cb)
+                    } else {
+                        cb()
+                    }
+                    return;
+                }
+
                 var t = 0;
 
                 var done = function(connector, modelConnectors) {

package/framework/{v0.4.5 → v0.4.6}/lib/nunjucks-filters/src/main.js

@@ -127,17 +127,36 @@ function NunjucksFilters(conf) {
         return JSON.clone(self.options);
     };
 
+    // #TPL1 Tier-2 — per-request filter context. The async render delegates
+    // register the context-bearing filters ONCE on a shared per-bundle env and
+    // pass each request's { options, isProxyHost, throwError, req, res } through
+    // process.gina._renderALS (an AsyncLocalStorage .run() wrap around the
+    // awaited render). getUrl / getWebroot / t / tIcu read that store at CALL
+    // time, so a single shared filter table cannot bleed one request's context
+    // into another's interleaved async render (#B25). On the sync render path
+    // the delegate never enters .run() -> getStore() is undefined -> the
+    // per-request singleton (set by the per-request NunjucksFilters() call)
+    // applies, byte-identical to pre-#TPL1.
+    var getRenderCtx = function () {
+        var _store = ( typeof(process) != 'undefined' && process.gina && process.gina._renderALS )
+            ? process.gina._renderALS.getStore()
+            : null;
+        return _store || NunjucksFilters.instance._options || self.options;
+    };
+
     /**
-     * Resolve the bundle's web root URL.
+     * Resolve the bundle's web root URL (scheme + host[:port] + webroot).
      *
-     * Mirror of `SwigFilters.getWebroot`. Uses `ctx.options.envObj.getConf`
-     * to look up bundle config; intended for templates that need the
-     * absolute origin (scheme + host[:port] + webroot) for rendering links
-     * to other bundles.
+     * Mirror of `SwigFilters.getWebroot`. Resolves the target bundle's env
+     * config via the global Config registry
+     * (`getContext('gina').Config.instance.Env.getConf`) — the same lookup the
+     * sibling `getUrl` filter uses — for templates that need the absolute origin
+     * for rendering links to other bundles. When `obj` is omitted, `Env.getConf`
+     * defaults to the current bundle.
      *
      * @memberof NunjucksFilters
      * @param {string} input - Pipe input (typically a path string)
-     * @param {object} obj   - Bundle name passed to `envObj.getConf`
+     * @param {string} [obj] - Bundle name; defaults to the current bundle
      * @returns {string} Absolute URL: `scheme://host[:port]/webroot`
      *
      * @example
@@ -145,10 +164,17 @@ function NunjucksFilters(conf) {
      */
     self.getWebroot = function (input, obj) {
 
-        var ctx  = NunjucksFilters.instance._options || self.options;
+        var ctx  = getRenderCtx();
 
+        // #B26 fix: the original line below threw on every invocation — `self.options`
+        // is the per-request wrapper ({ options, isProxyHost, throwError, req, res }), so
+        // `self.options.envObj` is undefined; and bare `options` was undeclared in this
+        // scope. Resolve the bundle env config the same way the sibling getUrl filter
+        // does, via the global Config registry.
+        //     , prop  = self.options.envObj.getConf(obj, options.conf.env)
+        var mainConf = getContext('gina').Config.instance;
         var url     = null
-            , prop  = self.options.envObj.getConf(obj, options.conf.env)
+            , prop  = mainConf.Env.getConf(obj, mainConf.env)
             , isProxyHost  = ( ctx.isProxyHost && String(ctx.isProxyHost).toLowerCase() === 'true' ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
         ;
         if ( isProxyHost ) {
@@ -189,7 +215,7 @@ function NunjucksFilters(conf) {
         if (typeof(params) == 'undefined') {
             params = {};
         }
-        var ctx  = NunjucksFilters.instance._options || self.options;
+        var ctx  = getRenderCtx();
 
         var config              = null
             , scheme            = null
@@ -452,7 +478,7 @@ function NunjucksFilters(conf) {
      *   {{ "common.items"    | t({ count: 5 }) }}
      */
     self.t = function(key, params) {
-        var ctx        = NunjucksFilters.instance._options || self.options;
+        var ctx        = getRenderCtx();
         var culture    = (ctx && ctx.req && ctx.req.culture)
             ? ctx.req.culture
             : (process.env.GINA_CULTURE || null);
@@ -485,7 +511,7 @@ function NunjucksFilters(conf) {
      *   {{ "user.greeting"  | tIcu({ gender: 'female', name: user.name }) }}
      */
     self.tIcu = function(key, params) {
-        var ctx        = NunjucksFilters.instance._options || self.options;
+        var ctx        = getRenderCtx();
         var culture    = (ctx && ctx.req && ctx.req.culture)
             ? ctx.req.culture
             : (process.env.GINA_CULTURE || null);

package/framework/{v0.4.5 → v0.4.6}/lib/routing/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/routing/src/main.js

@@ -201,7 +201,7 @@ function Routing() {
                 method              : method,
                 requirements        : routeObject.requirements,
                 namespace           : routeObject.namespace || undefined,
-                url                 : decodeURI(req.url), /// avoid %20
+                url                 : safeDecodeURI(req.url), /// avoid %20 — #B30 malformed-%-safe
                 rule                : routeObject.originalRule || cachedRoute.name,
 
                 param               : routeObject.param,
@@ -1474,7 +1474,7 @@ function Routing() {
 
         pathname    = url.replace( new RegExp('^('+ hostname +'|'+hostname.replace(/\:\d+/, '') +')' ), '');
         if ( typeof(request.routing.path) == 'undefined' )
-            request.routing.path = decodeURI(pathname);
+            request.routing.path = safeDecodeURI(pathname); // #B30 malformed-%-safe
         method      = ( typeof(method) != 'undefined' ) ? method.toLowerCase() : 'get';
 
         if (isMethodProvidedByDefault) {
@@ -1482,7 +1482,7 @@ function Routing() {
             request.originalMethod = request.method;
 
             request.method = method;
-            request.routing.path = decodeURI(pathname)
+            request.routing.path = safeDecodeURI(pathname) // #B30 malformed-%-safe
         }
         // last method check
         if ( !request.method)
@@ -1517,7 +1517,7 @@ function Routing() {
                     method              : localMethod,
                     requirements        : routing[name].requirements,
                     namespace           : routing[name].namespace || undefined,
-                    url                 : decodeURI(pathname), /// avoid %20
+                    url                 : safeDecodeURI(pathname), /// avoid %20 — #B30 malformed-%-safe
                     rule                : routing[name].originalRule || name,
                     param               : routing[name].param,
                     //middleware: routing[name].middleware,

package/framework/{v0.4.5 → v0.4.6}/lib/swig-filters/package.json

@@ -12,9 +12,6 @@
     "node": ">=0.10.22"
   },
   "main": "src/main",
-  "scripts": {
-    "test": "nodeunit test"
-  },
   "license": "MIT",
   "readmeFilename": "README.md"
 }

package/framework/{v0.4.5 → v0.4.6}/lib/swig-filters/src/main.js

@@ -104,13 +104,52 @@ function SwigFilters(conf) {
         return JSON.clone(self.options)
     }
 
-    // Allows you to get a bundle web root
+    // #TPL1 Tier-2 — per-request filter context. The async render delegates
+    // register the context-bearing filters ONCE on a shared per-bundle engine
+    // and pass each request's { options, isProxyHost, throwError, req, res }
+    // through process.gina._renderALS (an AsyncLocalStorage .run() wrap around
+    // the awaited render). getUrl / getWebroot / t / tIcu read that store at
+    // CALL time, so a single shared filter table cannot bleed one request's
+    // context into another's interleaved async render (#B25). On the sync
+    // render path the delegate never enters .run() -> getStore() is undefined
+    // -> the per-request singleton (set by the per-request SwigFilters() call)
+    // applies, byte-identical to pre-#TPL1.
+    var getRenderCtx = function () {
+        var _store = ( typeof(process) != 'undefined' && process.gina && process.gina._renderALS )
+            ? process.gina._renderALS.getStore()
+            : null;
+        return _store || SwigFilters.instance._options || self.options;
+    };
+
+    /**
+     * Resolve a bundle's absolute web root URL (scheme + host[:port] + webroot).
+     *
+     * Resolves the target bundle's env config via the global Config registry
+     * (`getContext('gina').Config.instance.Env.getConf`) — the same lookup the
+     * sibling `getUrl` filter uses. When `obj` is omitted, `Env.getConf` defaults
+     * to the current bundle.
+     *
+     * @memberof SwigFilters
+     * @param {string} input  - Pipe input (unused; templates pipe a placeholder)
+     * @param {string} [obj]  - Bundle name; defaults to the current bundle
+     * @returns {string} Absolute URL: `scheme://host[:port]/webroot`
+     *
+     * @example
+     *   {{ '' | getWebroot() }}
+     */
     self.getWebroot = function (input, obj) {
 
-        var ctx  = SwigFilters.instance._options || self.options;
+        var ctx  = getRenderCtx();
 
+        // #B26 fix: the original line below threw on every invocation — `self.options`
+        // is the per-request wrapper ({ options, isProxyHost, throwError, req, res }), so
+        // `self.options.envObj` is undefined; and bare `options` was undeclared in this
+        // scope. Resolve the bundle env config the same way the sibling getUrl filter
+        // does, via the global Config registry.
+        //     , prop  = self.options.envObj.getConf(obj, options.conf.env)
+        var mainConf = getContext('gina').Config.instance;
         var url     = null
-            , prop  = self.options.envObj.getConf(obj, options.conf.env)
+            , prop  = mainConf.Env.getConf(obj, mainConf.env)
             , isProxyHost  = ( ctx.isProxyHost && String(ctx.isProxyHost).toLowerCase() === 'true' ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
         ;
         if ( isProxyHost ) {
@@ -166,7 +205,7 @@ function SwigFilters(conf) {
         if (typeof(params) == 'undefined') {
             params = {}
         }
-        var ctx  = SwigFilters.instance._options || self.options;
+        var ctx  = getRenderCtx();
 
         var config              = null
             , scheme            = null
@@ -421,7 +460,7 @@ function SwigFilters(conf) {
      *   {{ "common.items"    | t({ count: 5 }) }}
      */
     self.t = function(key, params) {
-        var ctx        = SwigFilters.instance._options || self.options;
+        var ctx        = getRenderCtx();
         var culture    = (ctx && ctx.req && ctx.req.culture)
             ? ctx.req.culture
             : (process.env.GINA_CULTURE || null);
@@ -454,7 +493,7 @@ function SwigFilters(conf) {
      *   {{ "user.greeting"  | tIcu({ gender: 'female', name: user.name }) }}
      */
     self.tIcu = function(key, params) {
-        var ctx        = SwigFilters.instance._options || self.options;
+        var ctx        = getRenderCtx();
         var culture    = (ctx && ctx.req && ctx.req.culture)
             ? ctx.req.culture
             : (process.env.GINA_CULTURE || null);