Handle more reservedIP cases

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.26.6",
+	"version": "0.26.11",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/cache.ts

@@ -80,7 +80,9 @@ export class Cache<K extends string | number | symbol, T> {
 			if(persists.storage?.database != undefined) {
 				(<Database>persists.storage).createTable({name: persists.key, key: <string>this.key}).then(table => {
 					if(key) {
-						table.set(this.get(key), key);
+						const value = this.get(key);
+						if(value != null) table.set(value, key);
+						else table.delete(key);
 					} else {
 						table.clear();
 						this.all().forEach(row => table.add(row));

src/misc.ts

@@ -47,6 +47,17 @@ export function ipV6ToV4(ip: string) {
 	return ipv4;
 }
 
+/**
+ * Check if IP is reserved, e.g. localhost, private IPs, etc.
+ * @param {string} ip
+ * @returns {boolean}
+ */
+export function reservedIp(ip: string): boolean {
+	if(ip == 'localhost' || ip == '127.0.0.1') return true;
+	return /\b(10\.(?:[0-9]{1,3}\.){2}[0-9]{1,3})\b|\b(172\.(?:1[6-9]|2[0-9]|3[0-1])\.(?:[0-9]{1,3}\.)[0-9]{1,3})\b|\b(192\.168\.(?:[0-9]{1,3}\.)[0-9]{1,3})\b/.test(ip);
+}
+
+
 /**
  * Represents a function that listens for events and handles them accordingly.
  *

src/search.ts

@@ -39,6 +39,8 @@ export function logicTest(target: object, condition: string): boolean {
 			case '=':
 			case '==': return a == b;
 			case '!=': return a != b;
+			case '+': return typeof a?.includes != 'undefined' ? a.includes(b) : a == b;
+			case '-': return typeof a?.includes != 'undefined' ? !a.includes(b) : a != b;
 			case '>': return a > b;
 			case '>=': return a >= b;
 			case '<': return a < b;
@@ -53,7 +55,7 @@ export function logicTest(target: object, condition: string): boolean {
 		const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
 		return and.filter(p => {
 			// Boolean operator
-			const prop = /(\S+)\s*(==?|!=|>=|>|<=|<)\s*(\S+)/g.exec(p);
+			const prop = /(\S+)\s*(==?|!=|\+|-|>=|>|<=|<)\s*(\S+)/g.exec(p);
 			if(prop) {
 				const key = Object.keys(target).find(k => k.toLowerCase() == prop[1].toLowerCase());
 				return evalBoolean(dotNotation<any>(target, key || prop[1]),  prop[2], JSONAttemptParse(prop[3]));