not-node 6.5.60 → 6.5.62

package/bin/not-builder.js

@@ -9,7 +9,9 @@
 
 */
 
-let { argv } = require("yargs"),
+const yargs = require("yargs"),
+    { hideBin } = require("yargs/helpers"),
+    argv = yargs(hideBin(process.argv)).parse(),
     fs = require("fs"),
     path = require("path"),
     child_process = require("child_process"),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.60",
+	"version": "6.5.62",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"@bluelovers/deep-diff": "^1.0.3",
 		"@eslint/js": "^10.0.1",
-		"ajv": "^8.17.1",
+		"ajv": "^8.18.0",
 		"body-parser": "^2.2.2",
 		"commander": "^14.0.3",
 		"compression": "^1.8.1",
@@ -46,7 +46,7 @@
 		"connect-redis": "^9.0.0",
 		"cors": "^2.8.6",
 		"deepmerge": "^4.3.1",
-		"ejs": "^4.0.1",
+		"ejs": "^5.0.1",
 		"escape-string-regexp": "*",
 		"express": "^5.2.1",
 		"express-fileupload": "^1.5.2",
@@ -54,17 +54,17 @@
 		"fs-extra": "*",
 		"generate-password": "^1.7.1",
 		"helmet": "^8.1.0",
-		"inquirer": "^13.2.2",
+		"inquirer": "^13.3.0",
 		"inquirer-autocomplete-prompt": "^3.0.1",
 		"jsonwebtoken": "^9.0.3",
 		"method-override": "^3.0.0",
 		"mongoose-validator": "*",
 		"nconf": "*",
 		"rate-limiter-flexible": "^9.1.1",
-		"redis": "^5.10.0",
+		"redis": "^5.11.0",
 		"redlock": "^5.0.0-beta.2",
 		"rfdc": "^1.4.1",
-		"rimraf": "^6.1.2",
+		"rimraf": "^6.1.3",
 		"serve-static": "*",
 		"simple-git": "*",
 		"validator": "*",
@@ -82,21 +82,21 @@
 		"babel-eslint": "^10.1.0",
 		"chai": "*",
 		"chai-as-promised": "*",
-		"eslint": "^10.0.0",
+		"eslint": "^10.0.3",
 		"eslint-plugin-node": "^11.1.0",
 		"husky": "^9.1.7",
 		"ink-docstrap": "^1.3.2",
-		"ioredis": "^5.9.2",
+		"ioredis": "^5.10.0",
 		"jsdoc": "^4.0.5",
 		"mocha": "*",
 		"mocha-suppress-logs": "^0.6.0",
 		"mock-require": "^3.0.3",
 		"mongodb-memory-server": "^11.0.1",
-		"mongoose": "^9.1.6",
+		"mongoose": "^9.3.0",
 		"not-error": "*",
 		"not-validation": "*",
 		"npm-run-all": "^4.1.5",
-		"nyc": "^17.1.0",
+		"nyc": "^18.0.0",
 		"retire": "^5.4.2"
 	},
 	"homepage": "https://github.com/interrupter/not-node#readme",

package/src/common.js

@@ -342,17 +342,14 @@ module.exports.generatePaths = (content = [], relative = "src") => {
  **/
 module.exports.getIP = (req) => {
     if (req) {
-        const ip =
+        return (
             (req.headers && req.headers["x-forwarded-for"]) ||
             (req.connection && req.connection.remoteAddress) ||
             (req.socket && req.socket.remoteAddress) ||
             (req.connection &&
                 req.connection.socket &&
-                req.connection.socket.remoteAddress);
-        if (ip && ip.indexOf(",") > -1) {
-            return ip.split(",")[0];
-        }
-        return ip;
+                req.connection.socket.remoteAddress)
+        );
     } else {
         return undefined;
     }

package/src/core/validators/string.ip.js

@@ -2,7 +2,14 @@ module.exports = [
     ...require("./string"),
     {
         validator(val, { validator }) {
-            return validator.isIP(val);
+            if (val.indexOf(",") > -1) {
+                return val
+                    .split(",")
+                    .map((ip) => ip.trim())
+                    .every((ip) => validator.isIP(ip));
+            } else {
+                return validator.isIP(val);
+            }
         },
         message: "not-node:value_is_not_ip_address",
     },

package/src/init/lib/env.js

@@ -95,8 +95,13 @@ module.exports = class InitENV {
         );
     }
 
-    static initFromTemplate({ config, master }) {
-        InitENV.CONFIG_SET.forEach((item) => {
+    static initFromTemplate({ options, config, master }) {
+        const CUSTOM_SET =
+            options?.customPaths && Array.isArray(options?.customPaths)
+                ? options?.customPaths
+                : [];
+        const ALL_CONFIGS_SET = [...InitENV.CONFIG_SET, ...CUSTOM_SET];
+        ALL_CONFIGS_SET.forEach((item) => {
             InitENV.setObsoleteAndNew({
                 config,
                 master,
@@ -113,7 +118,7 @@ module.exports = class InitENV {
         master.setEnv("hostname", config.get("hostname"));
         master.setEnv("server", `https://` + config.get("host"));
 
-        InitENV.initFromTemplate({ config, master });
+        InitENV.initFromTemplate({ config, master, options });
 
         config.set(
             "appPath",

package/test/core.validators.js

@@ -675,7 +675,12 @@ describe("Core Validators", () => {
                 });
             });
 
-            const listOfValidValues = ["127.0.1.1", "10.8.1.10", "0.0.0.0"];
+            const listOfValidValues = [
+                "127.0.1.1",
+                "10.8.1.10",
+                "0.0.0.0",
+                "123.1.1.4, 192.123.4.1",
+            ];
             listOfValidValues.forEach((val) => {
                 it(
                     "valid: " + val,