tuijs-util 1.4.6 → 1.4.9

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "tuijs-util",
-    "version": "1.4.6",
+    "version": "1.4.9",
     "module": "src/esm/index.js",
     "main": "src/cjs/index.cjs",
     "exports": {
-      ".": {
-        "import": "./src/esm/index.js",
-        "require": "./src/cjs/index.cjs"
-      }
+        ".": {
+            "import": "./src/esm/index.js",
+            "require": "./src/cjs/index.cjs"
+        }
     },
     "description": "A simple JavaScript utility library",
     "author": "TechTB LLC",
@@ -15,11 +15,12 @@
     "repository": "github:TechTB-OpenSource/tuijs-util",
     "type": "module",
     "scripts": {
-        "build": "rollup -c  rollup.config.js"
+        "build": "rollup -c  rollup.config.js",
+        "list": "node bin\\index.js"
     },
     "devDependencies": {
         "@rollup/plugin-babel": "^6.0.4",
-        "@rollup/plugin-node-resolve": "^16.0.0",
-        "rollup": "^4.30.1"
+        "@rollup/plugin-node-resolve": "^16.0.1",
+        "rollup": "^4.37.0"
     }
-}
+}

package/src/cjs/index.cjs

@@ -27,6 +27,15 @@ const regExUrl = new RegExp('^(https?:\\/\\/)?' +
 // query string
 '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
 const regExEmail = /^[\w-\.]+@([\w-]+\.)+[a-zA-Z]{2,}$/;
+const regExIpv4 = /^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$/;
+const regExIpv6 = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
+const regExMacNoSeparator = /^[0-9a-fA-F]{12}$/;
+const regExMacHyphenPairs = /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5}$/;
+const regExMacHyphenQuads = /^[0-9a-fA-F]{4}(-[0-9a-fA-F]{4}){2}$/;
+const regExMacDotPairs = /^[0-9a-fA-F]{2}(\.[0-9a-fA-F]{2}){5}$/;
+const regExMacDotQuads = /^[0-9a-fA-F]{4}(\.[0-9a-fA-F]{4}){2}$/;
+const regExMacColonPairs = /^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}$/;
+const regExMacColonQuads = /^[0-9a-fA-F]{4}(:[0-9a-fA-F]{4}){2}$/;
 
 /**
  * Removes characters from a string based on a provided regex pattern.
@@ -78,12 +87,60 @@ function checkUrl(string) {
       return false;
     }
     ;
-    return regExUrl.test(string); // Returns false if the url is invalid
+    return regExUrl.test(string);
   } catch (er) {
     console.error(er);
   }
 }
 
+/**
+ * Checks for a valid Mac Address (Uses RegEx).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+function checkMac(string) {
+  if (typeof string !== 'string' || string.length === 0) {
+    return false;
+  }
+  if (regExMacNoSeparator.test(string) || regExMacColonPairs.test(string) || regExMacColonQuads.test(string) || regExMacHyphenPairs.test(string) || regExMacHyphenQuads.test(string) || regExMacDotPairs.test(string) || regExMacDotQuads.test(string)) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Checks for a valid IP (Uses checkIpv4 and checkIpv6).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+function checkIp(string) {
+  return checkIpv4(string) || checkIpv6(string);
+}
+
+/**
+ * Checks for a valid IPv4 (Uses RegEx).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+function checkIpv4(string) {
+  if (typeof string !== 'string' || string.length === 0) {
+    return false;
+  }
+  return regExIpv4.test(string);
+}
+
+/**
+ * Checks for a valid IPv6 (Uses RegEx).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+function checkIpv6(string) {
+  if (typeof string !== 'string' || string.length === 0) {
+    return false;
+  }
+  return regExIpv6.test(string);
+}
+
 /**
  * Checks for special characters (Uses RegEx).
  * @param {string} string 
@@ -262,6 +319,39 @@ function checkIsFunction(input) {
   }
 }
 
+/**
+ * Checks an input to determine if it is a valid subnet mask.
+ * @param {string} mask 
+ * @returns {boolean} - Returns true if the input is a Function and false if not.
+ * @throws {Error} - Throws error message if error occurs.
+ */
+function checkSubnetMask(mask) {
+  try {
+    if (typeof mask != 'string') {
+      return false;
+    }
+    const maskArray = mask.split('.').map(octet => parseInt(octet, 10));
+    if (maskArray.length !== 4) {
+      return false;
+    }
+    if (maskArray.some(num => Number.isNaN(num))) {
+      return false;
+    }
+    const binaryMask = maskArray.map(num => num.toString(2).padStart(8, '0')).join('');
+    if (/01.*10/.test(binaryMask)) {
+      return false;
+    }
+    for (let i = 0; i < maskArray.length; i++) {
+      if (maskArray[i] > 255 || maskArray[i] < 0) {
+        return false;
+      }
+    }
+    return true;
+  } catch (er) {
+    console.error(er);
+  }
+}
+
 /**
  * Takes an HTML template literal, parses it, then extracts it.
  * All elements in the template MUST be contained within a single set of template tags.
@@ -385,21 +475,153 @@ function urlAddHttps(url) {
   }
 }
 
+/**
+
+ */
+function createReqInstance() {
+  let controllers = new Map();
+  function createController(id) {
+    if (controllers.has(id)) {
+      abortRequest(id); // Ensure previous request is aborted
+    }
+    const controller = new AbortController();
+    controllers.set(id, controller);
+    return controller.signal;
+  }
+  function abortRequest(id) {
+    if (controllers.has(id)) {
+      controllers.get(id).abort();
+      controllers.delete(id);
+    }
+  }
+  function abortAll() {
+    controllers.forEach(controller => controller.abort());
+    controllers.clear();
+  }
+  async function reqGet(url, id) {
+    try {
+      const signal = createController(id);
+      const res = await fetch(url, {
+        method: 'GET',
+        signal
+      });
+      return res;
+    } catch (er) {
+      if (er.name === 'AbortError') {
+        console.warn('Fetch aborted:', url);
+      } else {
+        console.error(er);
+      }
+    }
+  }
+  async function reqGetJson(url, id) {
+    try {
+      const signal = createController(id);
+      const res = await fetch(url, {
+        method: 'GET',
+        signal
+      });
+      return await res.json();
+    } catch (er) {
+      if (er.name === 'AbortError') {
+        console.warn('Fetch aborted:', url);
+      } else {
+        console.error(er);
+      }
+    }
+  }
+  async function reqGetText(url, id) {
+    try {
+      const signal = createController(id);
+      const res = await fetch(url, {
+        method: 'GET',
+        signal
+      });
+      return await res.text();
+    } catch (er) {
+      if (er.name === 'AbortError') {
+        console.warn('Fetch aborted:', url);
+      } else {
+        console.error(er);
+      }
+    }
+  }
+  async function reqPostJson(url, dataJson, id) {
+    try {
+      const signal = createController(id);
+      if (!dataJson || typeof dataJson !== 'object') {
+        throw new Error(`Invalid JSON data`);
+      }
+      const res = await fetch(url, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dataJson),
+        signal
+      });
+      return res;
+    } catch (er) {
+      if (er.name === 'AbortError') {
+        console.warn('Fetch aborted:', url);
+      } else {
+        console.error(er);
+      }
+    }
+  }
+  async function reqPostForm(url, dataForm, id) {
+    try {
+      const signal = createController(id);
+      if (!(dataForm instanceof FormData)) {
+        throw new Error(`Provided data is not FormData`);
+      }
+      const res = await fetch(url, {
+        method: 'POST',
+        body: dataForm,
+        signal
+      });
+      return res;
+    } catch (er) {
+      if (er.name === 'AbortError') {
+        console.warn('Fetch aborted:', url);
+      } else {
+        console.error(er);
+      }
+    }
+  }
+  return {
+    createController,
+    abortRequest,
+    abortAll,
+    reqGet,
+    reqGetJson,
+    reqGetText,
+    reqPostJson,
+    reqPostForm
+  };
+}
+
 /**
  * Sends GET request to specified URL
  * @async
  * @param {string} url
+ * @param {  }
  * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqGet(url) {
+async function reqGet(url, signal = null) {
   try {
     const res = await fetch(url, {
-      method: 'GET'
+      method: 'GET',
+      signal
     });
     return res;
   } catch (er) {
-    console.error(er);
+    if (er.name === 'AbortError') {
+      console.warn('Fetch aborted:', url);
+    } else {
+      console.error(er);
+    }
   }
 }
 
@@ -410,15 +632,19 @@ async function reqGet(url) {
  * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqGetJson(url) {
+async function reqGetJson(url, signal = null) {
   try {
     const res = await fetch(url, {
-      method: 'GET'
+      method: 'GET',
+      signal
     });
-    const data = await res.json();
-    return data;
+    return await res.json();
   } catch (er) {
-    console.error(er);
+    if (er.name === 'AbortError') {
+      console.warn('Fetch aborted:', url);
+    } else {
+      console.error(er);
+    }
   }
 }
 
@@ -429,15 +655,19 @@ async function reqGetJson(url) {
  * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqGetText(url) {
+async function reqGetText(url, signal = null) {
   try {
     const res = await fetch(url, {
-      method: 'GET'
+      method: 'GET',
+      signal
     });
-    const data = await res.text();
-    return data;
+    return await res.text();
   } catch (er) {
-    console.error(er);
+    if (er.name === 'AbortError') {
+      console.warn('Fetch aborted:', url);
+    } else {
+      console.error(er);
+    }
   }
 }
 
@@ -449,24 +679,26 @@ async function reqGetText(url) {
  * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqPostJson(url, dataJson) {
+async function reqPostJson(url, dataJson, signal = null) {
   try {
-    if (dataJson === null || dataJson === undefined) {
-      throw new Error(`No data provided.`);
-    }
-    if (!checkIsJson(dataJson)) {
-      throw new Error(`Provided data is not JSON.`);
+    if (!dataJson || typeof dataJson !== 'object') {
+      throw new Error(`Invalid JSON data`);
     }
     const res = await fetch(url, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'
       },
-      body: dataJson
+      body: JSON.stringify(dataJson),
+      signal
     });
     return res;
   } catch (er) {
-    console.error(er);
+    if (er.name === 'AbortError') {
+      console.warn('Fetch aborted:', url);
+    } else {
+      console.error(er);
+    }
   }
 }
 
@@ -477,18 +709,23 @@ async function reqPostJson(url, dataJson) {
  * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-async function reqPostForm(url, dataForm) {
+async function reqPostForm(url, dataForm, signal = null) {
   try {
     if (!(dataForm instanceof FormData)) {
-      throw new Error(`The data provided was not form data`);
+      throw new Error(`Provided data is not FormData`);
     }
     const res = await fetch(url, {
       method: 'POST',
-      body: dataForm
+      body: dataForm,
+      signal
     });
     return res;
   } catch (er) {
-    console.error(er);
+    if (er.name === 'AbortError') {
+      console.warn('Fetch aborted:', url);
+    } else {
+      console.error(er);
+    }
   }
 }
 
@@ -497,6 +734,207 @@ const listUpChar = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 const listLowChar = 'abcdefghijklmnopqrstuvwxyz';
 const listSpecChar = '!@#$%^&*()';
 const listHtmlTags = ["html", "body", "div", "span", "applet", "object", "iframe", "h1", "h2", "h3", "h4", "h5", "h6", "p", "blockquote", "pre", "a", "abbr", "acronym", "address", "big", "cite", "code", "del", "dfn", "em", "img", "ins", "kbd", "q", "s", "samp", "small", "strike", "strong", "sub", "sup", "tt", "var", "b", "u", "i", "center", "dl", "dt", "dd", "ol", "ul", "li", "fieldset", "form", "label", "legend", "table", "caption", "tbody", "tfoot", "thead", "tr", "th", "td", "article", "aside", "canvas", "details", "embed", "figure", "figcaption", "footer", "header", "hgroup", "menu", "nav", "output", "ruby", "section", "summary", "time", "mark", "audio", "video"];
+const listSubnets = [{
+  bits: 8,
+  cidr: '/8',
+  subnetMask: '255.0.0.0',
+  wildcardMask: '0.255.255.255',
+  totalAddresses: 16_777_216,
+  usableHosts: 16_777_214,
+  networks: 1
+}, {
+  bits: 9,
+  cidr: '/9',
+  subnetMask: '255.128.0.0',
+  wildcardMask: '0.127.255.255',
+  totalAddresses: 8_388_608,
+  usableHosts: 8_388_606,
+  networks: 2
+}, {
+  bits: 10,
+  cidr: '/10',
+  subnetMask: '255.192.0.0',
+  wildcardMask: '0.63.255.255',
+  totalAddresses: 4_194_304,
+  usableHosts: 4_194_302,
+  networks: 4
+}, {
+  bits: 11,
+  cidr: '/11',
+  subnetMask: '255.224.0.0',
+  wildcardMask: '0.31.255.255',
+  totalAddresses: 2_097_152,
+  usableHosts: 2_097_150,
+  networks: 8
+}, {
+  bits: 12,
+  cidr: '/12',
+  subnetMask: '255.240.0.0',
+  wildcardMask: '0.15.255.255',
+  totalAddresses: 1_048_576,
+  usableHosts: 1_048_574,
+  networks: 16
+}, {
+  bits: 13,
+  cidr: '/13',
+  subnetMask: '255.248.0.0',
+  wildcardMask: '0.7.255.255',
+  totalAddresses: 524_288,
+  usableHosts: 524_286,
+  networks: 32
+}, {
+  bits: 14,
+  cidr: '/14',
+  subnetMask: '255.252.0.0',
+  wildcardMask: '0.3.255.255',
+  totalAddresses: 262_144,
+  usableHosts: 262_142,
+  networks: 64
+}, {
+  bits: 15,
+  cidr: '/15',
+  subnetMask: '255.254.0.0',
+  wildcardMask: '0.1.255.255',
+  totalAddresses: 131_072,
+  usableHosts: 131_070,
+  networks: 128
+}, {
+  bits: 16,
+  cidr: '/16',
+  subnetMask: '255.255.0.0',
+  wildcardMask: '0.0.255.255',
+  totalAddresses: 65_536,
+  usableHosts: 65_534,
+  networks: 256
+}, {
+  bits: 17,
+  cidr: '/17',
+  subnetMask: '255.255.128.0',
+  wildcardMask: '0.0.127.255',
+  totalAddresses: 32_768,
+  usableHosts: 32_766,
+  networks: 512
+}, {
+  bits: 18,
+  cidr: '/18',
+  subnetMask: '255.255.192.0',
+  wildcardMask: '0.0.63.255',
+  totalAddresses: 16_384,
+  usableHosts: 16_382,
+  networks: 1_024
+}, {
+  bits: 19,
+  cidr: '/19',
+  subnetMask: '255.255.224.0',
+  wildcardMask: '0.0.31.255',
+  totalAddresses: 8_192,
+  usableHosts: 8_190,
+  networks: 2_048
+}, {
+  bits: 20,
+  cidr: '/20',
+  subnetMask: '255.255.240.0',
+  wildcardMask: '0.0.15.255',
+  totalAddresses: 4_096,
+  usableHosts: 4_094,
+  networks: 4_096
+}, {
+  bits: 21,
+  cidr: '/21',
+  subnetMask: '255.255.248.0',
+  wildcardMask: '0.0.7.255',
+  totalAddresses: 2_048,
+  usableHosts: 2_046,
+  networks: 8_192
+}, {
+  bits: 22,
+  cidr: '/22',
+  subnetMask: '255.255.252.0',
+  wildcardMask: '0.0.3.255',
+  totalAddresses: 1_024,
+  usableHosts: 1_022,
+  networks: 16_384
+}, {
+  bits: 23,
+  cidr: '/23',
+  subnetMask: '255.255.254.0',
+  wildcardMask: '0.0.1.255',
+  totalAddresses: 512,
+  usableHosts: 510,
+  networks: 32_768
+}, {
+  bits: 24,
+  cidr: '/24',
+  subnetMask: '255.255.255.0',
+  wildcardMask: '0.0.0.255',
+  totalAddresses: 256,
+  usableHosts: 254,
+  networks: 65_536
+}, {
+  bits: 25,
+  cidr: '/25',
+  subnetMask: '255.255.255.128',
+  wildcardMask: '0.0.0.127',
+  totalAddresses: 128,
+  usableHosts: 126,
+  networks: 131_072
+}, {
+  bits: 26,
+  cidr: '/26',
+  subnetMask: '255.255.255.192',
+  wildcardMask: '0.0.0.63',
+  totalAddresses: 64,
+  usableHosts: 62,
+  networks: 262_144
+}, {
+  bits: 27,
+  cidr: '/27',
+  subnetMask: '255.255.255.224',
+  wildcardMask: '0.0.0.31',
+  totalAddresses: 32,
+  usableHosts: 30,
+  networks: 524_288
+}, {
+  bits: 28,
+  cidr: '/28',
+  subnetMask: '255.255.255.240',
+  wildcardMask: '0.0.0.15',
+  totalAddresses: 16,
+  usableHosts: 14,
+  networks: 1_048_576
+}, {
+  bits: 29,
+  cidr: '/29',
+  subnetMask: '255.255.255.248',
+  wildcardMask: '0.0.0.7',
+  totalAddresses: 8,
+  usableHosts: 6,
+  networks: 2_097_152
+}, {
+  bits: 30,
+  cidr: '/30',
+  subnetMask: '255.255.255.252',
+  wildcardMask: '0.0.0.3',
+  totalAddresses: 4,
+  usableHosts: 2,
+  networks: 4_194_304
+}, {
+  bits: 31,
+  cidr: '/31',
+  subnetMask: '255.255.255.254',
+  wildcardMask: '0.0.0.1',
+  totalAddresses: 2,
+  usableHosts: '2 (P2P)',
+  networks: 8_388_608
+}, {
+  bits: 32,
+  cidr: '/32',
+  subnetMask: '255.255.255.255',
+  wildcardMask: '0.0.0.0',
+  totalAddresses: 1,
+  usableHosts: 0,
+  networks: 16_777_216
+}];
 
 /**
  * Adds zero in front of numbers less than 10 and returns as a string.
@@ -611,6 +1049,33 @@ function scrollIntoView() {
     removeAllObservers
   };
 }
+function convertBitsToMask(bits) {
+  try {
+    if (bits < 0 || bits > 32) {
+      throw new Error("Bits must be between 0 and 32");
+    }
+    const mask = 0xffffffff << 32 - bits >>> 0;
+    return [mask >>> 24 & 0xff, mask >>> 16 & 0xff, mask >>> 8 & 0xff, mask & 0xff].join('.');
+  } catch (er) {
+    console.error(er);
+    return;
+  }
+}
+function convertMaskToBits(mask) {
+  try {
+    if (!checkSubnetMask(mask)) {
+      throw new Error("Invalid subnet mask.");
+    }
+    return maskArray.map(num => num.toString(2).padStart(8, '0')) // ['11111111', '11111111', '11111111', '00000000']
+    .join('') // '11111111111111111111111100000000'
+    .split('') // ['1','1','1',...,'0','0']
+    .filter(bit => bit === '1') // Keep only the '1's
+    .length; // Count them
+  } catch (er) {
+    console.error(er);
+    return;
+  }
+}
 
 /**
  * Parses a function and its parameters when it is in the form of a string.
@@ -645,17 +1110,25 @@ function parseFunctionString(string) {
 exports.addLeadZero = addLeadZero;
 exports.checkEmail = checkEmail;
 exports.checkFqdn = checkFqdn;
+exports.checkIp = checkIp;
+exports.checkIpv4 = checkIpv4;
+exports.checkIpv6 = checkIpv6;
 exports.checkIsArray = checkIsArray;
 exports.checkIsElement = checkIsElement;
 exports.checkIsFunction = checkIsFunction;
 exports.checkIsJson = checkIsJson;
 exports.checkIsObject = checkIsObject;
 exports.checkLowercase = checkLowercase;
+exports.checkMac = checkMac;
 exports.checkNum = checkNum;
 exports.checkSpaces = checkSpaces;
 exports.checkSpecialChar = checkSpecialChar;
+exports.checkSubnetMask = checkSubnetMask;
 exports.checkUppercase = checkUppercase;
 exports.checkUrl = checkUrl;
+exports.convertBitsToMask = convertBitsToMask;
+exports.convertMaskToBits = convertMaskToBits;
+exports.createReqInstance = createReqInstance;
 exports.elmCleaner = elmCleaner;
 exports.elmCleanerArray = elmCleanerArray;
 exports.elmCleanerTr = elmCleanerTr;
@@ -664,6 +1137,7 @@ exports.listHtmlTags = listHtmlTags;
 exports.listLowChar = listLowChar;
 exports.listNumChar = listNumChar;
 exports.listSpecChar = listSpecChar;
+exports.listSubnets = listSubnets;
 exports.listUpChar = listUpChar;
 exports.parseFunctionString = parseFunctionString;
 exports.parseTemplate = parseTemplate;
@@ -676,9 +1150,18 @@ exports.regExFqdn = regExFqdn;
 exports.regExHex = regExHex;
 exports.regExHexChar = regExHexChar;
 exports.regExHexNon = regExHexNon;
+exports.regExIpv4 = regExIpv4;
+exports.regExIpv6 = regExIpv6;
 exports.regExLetters = regExLetters;
 exports.regExLettersLower = regExLettersLower;
 exports.regExLettersUpper = regExLettersUpper;
+exports.regExMacColonPairs = regExMacColonPairs;
+exports.regExMacColonQuads = regExMacColonQuads;
+exports.regExMacDotPairs = regExMacDotPairs;
+exports.regExMacDotQuads = regExMacDotQuads;
+exports.regExMacHyphenPairs = regExMacHyphenPairs;
+exports.regExMacHyphenQuads = regExMacHyphenQuads;
+exports.regExMacNoSeparator = regExMacNoSeparator;
 exports.regExNumbers = regExNumbers;
 exports.regExSpecial = regExSpecial;
 exports.regExUrl = regExUrl;

package/src/esm/index.js

@@ -1,15 +1,20 @@
 export {
     checkEmail,
     checkFqdn,
+    checkIp,
+    checkIpv4,
+    checkIpv6,
     checkIsArray,
     checkIsElement,
     checkIsFunction,
     checkIsJson,
     checkIsObject,
     checkLowercase,
+    checkMac,
     checkNum,
     checkSpaces,
     checkSpecialChar,
+    checkSubnetMask,
     checkUppercase,
     checkUrl
 } from './lib/util.check.js';
@@ -20,6 +25,7 @@ export {
     parseTemplate,
 } from './lib/util.dom.js';
 export {
+    createReqInstance,
     reqGet,
     reqGetJson,
     reqGetText,
@@ -33,14 +39,17 @@ export {
     listLowChar,
     listNumChar,
     listSpecChar,
+    listSubnets,
     listUpChar
 } from './lib/util.lists.js';
 export {
     addLeadZero,
+    convertBitsToMask,
+    convertMaskToBits,
     generateUID,
     preloadImages,
-    sleep,
-    scrollIntoView
+    scrollIntoView,
+    sleep
 } from './lib/util.misc.js';
 export {
     parseFunctionString
@@ -54,9 +63,18 @@ export {
     regExHex,
     regExHexChar,
     regExHexNon,
+    regExIpv4,
+    regExIpv6,
     regExLetters,
     regExLettersLower,
     regExLettersUpper,
+    regExMacColonPairs,
+    regExMacColonQuads,
+    regExMacDotPairs,
+    regExMacDotQuads,
+    regExMacHyphenPairs,
+    regExMacHyphenQuads,
+    regExMacNoSeparator,
     regExNumbers,
     regExSpecial,
     regExUrl,

package/src/esm/lib/util.check.js

@@ -1,4 +1,21 @@
-import { regExNumbers, regExLettersLower, regExLettersUpper, regExSpecial, regExFqdn, regExUrl, regExEmail } from "./util.regex.js";
+import {
+    regExNumbers,
+    regExLettersLower,
+    regExLettersUpper,
+    regExSpecial,
+    regExFqdn,
+    regExUrl,
+    regExEmail,
+    regExIpv4,
+    regExIpv6,
+    regExMacNoSeparator,
+    regExMacColonPairs,
+    regExMacColonQuads,
+    regExMacHyphenPairs,
+    regExMacHyphenQuads,
+    regExMacDotPairs,
+    regExMacDotQuads
+} from "./util.regex.js";
 
 /**
  * Checks for a valid FQDN (Uses RegEx).
@@ -29,12 +46,68 @@ export function checkUrl(string) {
         if (typeof string !== 'string' || string.length === 0) {
             return false;
         };
-        return regExUrl.test(string); // Returns false if the url is invalid
+        return regExUrl.test(string);
     } catch (er) {
         console.error(er);
     }
 }
 
+/**
+ * Checks for a valid Mac Address (Uses RegEx).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+export function checkMac(string) {
+    if (typeof string !== 'string' || string.length === 0) {
+        return false;
+    }
+    if (
+        regExMacNoSeparator.test(string) ||
+        regExMacColonPairs.test(string) ||
+        regExMacColonQuads.test(string) ||
+        regExMacHyphenPairs.test(string) ||
+        regExMacHyphenQuads.test(string) ||
+        regExMacDotPairs.test(string) ||
+        regExMacDotQuads.test(string)
+    ) {
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Checks for a valid IP (Uses checkIpv4 and checkIpv6).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+export function checkIp(string) {
+    return checkIpv4(string) || checkIpv6(string);
+}
+
+/**
+ * Checks for a valid IPv4 (Uses RegEx).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+export function checkIpv4(string) {
+    if (typeof string !== 'string' || string.length === 0) {
+        return false;
+    }
+    return regExIpv4.test(string);
+}
+
+/**
+ * Checks for a valid IPv6 (Uses RegEx).
+ * @param {string} string 
+ * @returns {boolean} - Returns true if test is successful and false if the string is not validated or the RegEx test fails.
+ */
+export function checkIpv6(string) {
+    if (typeof string !== 'string' || string.length === 0) {
+        return false;
+    }
+    return regExIpv6.test(string);
+}
+
 /**
  * Checks for special characters (Uses RegEx).
  * @param {string} string 
@@ -212,3 +285,38 @@ export function checkIsFunction(input) {
         console.error(er);
     }
 }
+
+/**
+ * Checks an input to determine if it is a valid subnet mask.
+ * @param {string} mask 
+ * @returns {boolean} - Returns true if the input is a Function and false if not.
+ * @throws {Error} - Throws error message if error occurs.
+ */
+export function checkSubnetMask(mask) {
+    try {
+        if (typeof mask != 'string') {
+            return false;
+        }
+        const maskArray = mask.split('.').map(octet => parseInt(octet, 10));
+        if (maskArray.length !== 4) {
+            return false;
+        }
+        if (maskArray.some(num => Number.isNaN(num))) {
+            return false;
+        }
+        const binaryMask = maskArray
+            .map(num => num.toString(2).padStart(8, '0'))
+            .join('');
+        if (/01.*10/.test(binaryMask)) {
+            return false;
+        }
+        for (let i = 0; i < maskArray.length; i++) {
+            if (maskArray[i] > 255 || maskArray[i] < 0) {
+                return false;
+            }
+        }
+        return true;
+    } catch (er) {
+        console.error(er);
+    }
+}

package/src/esm/lib/util.http.js

@@ -40,19 +40,147 @@ export function urlAddHttps(url) {
     }
 }
 
+/**
+
+ */
+export function createReqInstance() {
+    let controllers = new Map()
+    function createController(id) {
+        if (controllers.has(id)) {
+            abortRequest(id); // Ensure previous request is aborted
+        }
+        const controller = new AbortController();
+        controllers.set(id, controller);
+        return controller.signal;
+    }
+
+    function abortRequest(id) {
+        if (controllers.has(id)) {
+            controllers.get(id).abort();
+            controllers.delete(id);
+        }
+    }
+
+    function abortAll() {
+        controllers.forEach(controller => controller.abort());
+        controllers.clear();
+    }
+
+    async function reqGet(url, id) {
+        try {
+            const signal = createController(id);
+            const res = await fetch(url, { method: 'GET', signal });
+            return res;
+        } catch (er) {
+            if (er.name === 'AbortError') {
+                console.warn('Fetch aborted:', url);
+            } else {
+                console.error(er);
+            }
+        }
+    }
+
+    async function reqGetJson(url, id) {
+        try {
+            const signal = createController(id);
+            const res = await fetch(url, { method: 'GET', signal });
+            return await res.json();
+        } catch (er) {
+            if (er.name === 'AbortError') {
+                console.warn('Fetch aborted:', url);
+            } else {
+                console.error(er);
+            }
+        }
+    }
+
+    async function reqGetText(url, id) {
+        try {
+            const signal = createController(id);
+            const res = await fetch(url, { method: 'GET', signal });
+            return await res.text();
+        } catch (er) {
+            if (er.name === 'AbortError') {
+                console.warn('Fetch aborted:', url);
+            } else {
+                console.error(er);
+            }
+        }
+    }
+
+    async function reqPostJson(url, dataJson, id) {
+        try {
+            const signal = createController(id);
+            if (!dataJson || typeof dataJson !== 'object') {
+                throw new Error(`Invalid JSON data`);
+            }
+            const res = await fetch(url, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(dataJson),
+                signal
+            });
+            return res;
+        } catch (er) {
+            if (er.name === 'AbortError') {
+                console.warn('Fetch aborted:', url);
+            } else {
+                console.error(er);
+            }
+        }
+    }
+
+    async function reqPostForm(url, dataForm, id) {
+        try {
+            const signal = createController(id);
+            if (!(dataForm instanceof FormData)) {
+                throw new Error(`Provided data is not FormData`);
+            }
+            const res = await fetch(url, {
+                method: 'POST',
+                body: dataForm,
+                signal
+            });
+            return res;
+        } catch (er) {
+            if (er.name === 'AbortError') {
+                console.warn('Fetch aborted:', url);
+            } else {
+                console.error(er);
+            }
+        }
+    }
+
+    return {
+        createController,
+        abortRequest,
+        abortAll,
+        reqGet,
+        reqGetJson,
+        reqGetText,
+        reqPostJson,
+        reqPostForm
+    };
+}
+
 /**
  * Sends GET request to specified URL
  * @async
  * @param {string} url
+ * @param {  }
  * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqGet(url) {
+export async function reqGet(url, signal = null) {
     try {
-        const res = await fetch(url, { method: 'GET' });
+        const res = await fetch(url, { method: 'GET', signal });
         return res;
     } catch (er) {
-        console.error(er);
+        if (er.name === 'AbortError') {
+            console.warn('Fetch aborted:', url);
+        } else {
+            console.error(er);
+        }
     }
 }
 
@@ -63,13 +191,16 @@ export async function reqGet(url) {
  * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqGetJson(url) {
+export async function reqGetJson(url, signal = null) {
     try {
-        const res = await fetch(url, { method: 'GET' });
-        const data = await res.json();
-        return data;
+        const res = await fetch(url, { method: 'GET', signal });
+        return await res.json();
     } catch (er) {
-        console.error(er);
+        if (er.name === 'AbortError') {
+            console.warn('Fetch aborted:', url);
+        } else {
+            console.error(er);
+        }
     }
 }
 
@@ -80,13 +211,16 @@ export async function reqGetJson(url) {
  * @returns {Promise<Object>} - Returns data if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqGetText(url) {
+export async function reqGetText(url, signal = null) {
     try {
-        const res = await fetch(url, { method: 'GET' });
-        const data = await res.text();
-        return data;
+        const res = await fetch(url, { method: 'GET', signal });
+        return await res.text();
     } catch (er) {
-        console.error(er);
+        if (er.name === 'AbortError') {
+            console.warn('Fetch aborted:', url);
+        } else {
+            console.error(er);
+        }
     }
 }
 
@@ -98,24 +232,24 @@ export async function reqGetText(url) {
  * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqPostJson(url, dataJson) {
+export async function reqPostJson(url, dataJson, signal = null) {
     try {
-        if (dataJson === null || dataJson === undefined) {
-            throw new Error(`No data provided.`);
-        }
-        if (!checkIsJson(dataJson)) {
-            throw new Error(`Provided data is not JSON.`);
+        if (!dataJson || typeof dataJson !== 'object') {
+            throw new Error(`Invalid JSON data`);
         }
         const res = await fetch(url, {
             method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: dataJson
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(dataJson),
+            signal
         });
         return res;
     } catch (er) {
-        console.error(er);
+        if (er.name === 'AbortError') {
+            console.warn('Fetch aborted:', url);
+        } else {
+            console.error(er);
+        }
     }
 }
 
@@ -126,17 +260,22 @@ export async function reqPostJson(url, dataJson) {
  * @returns {Promise<Object>} - Returns response if response is ok, otherwise it throws an Error.
  * @throws {Error} - Throws Error if an error is detected.
  */
-export async function reqPostForm(url, dataForm) {
+export async function reqPostForm(url, dataForm, signal = null) {
     try {
         if (!(dataForm instanceof FormData)) {
-            throw new Error(`The data provided was not form data`);
+            throw new Error(`Provided data is not FormData`);
         }
         const res = await fetch(url, {
             method: 'POST',
-            body: dataForm
+            body: dataForm,
+            signal
         });
         return res;
     } catch (er) {
-        console.error(er);
+        if (er.name === 'AbortError') {
+            console.warn('Fetch aborted:', url);
+        } else {
+            console.error(er);
+        }
     }
 }

package/src/esm/lib/util.lists.js

@@ -85,3 +85,33 @@ export const listHtmlTags = [
     "audio",
     "video"
 ];
+
+export const listSubnets = [
+    { bits: 8, cidr: '/8', subnetMask: '255.0.0.0', wildcardMask: '0.255.255.255', totalAddresses: 16_777_216, usableHosts: 16_777_214, networks: 1 },
+    { bits: 9, cidr: '/9', subnetMask: '255.128.0.0', wildcardMask: '0.127.255.255', totalAddresses: 8_388_608, usableHosts: 8_388_606, networks: 2 },
+    { bits: 10, cidr: '/10', subnetMask: '255.192.0.0', wildcardMask: '0.63.255.255', totalAddresses: 4_194_304, usableHosts: 4_194_302, networks: 4 },
+    { bits: 11, cidr: '/11', subnetMask: '255.224.0.0', wildcardMask: '0.31.255.255', totalAddresses: 2_097_152, usableHosts: 2_097_150, networks: 8 },
+    { bits: 12, cidr: '/12', subnetMask: '255.240.0.0', wildcardMask: '0.15.255.255', totalAddresses: 1_048_576, usableHosts: 1_048_574, networks: 16 },
+    { bits: 13, cidr: '/13', subnetMask: '255.248.0.0', wildcardMask: '0.7.255.255', totalAddresses: 524_288, usableHosts: 524_286, networks: 32 },
+    { bits: 14, cidr: '/14', subnetMask: '255.252.0.0', wildcardMask: '0.3.255.255', totalAddresses: 262_144, usableHosts: 262_142, networks: 64 },
+    { bits: 15, cidr: '/15', subnetMask: '255.254.0.0', wildcardMask: '0.1.255.255', totalAddresses: 131_072, usableHosts: 131_070, networks: 128 },
+    { bits: 16, cidr: '/16', subnetMask: '255.255.0.0', wildcardMask: '0.0.255.255', totalAddresses: 65_536, usableHosts: 65_534, networks: 256 },
+    { bits: 17, cidr: '/17', subnetMask: '255.255.128.0', wildcardMask: '0.0.127.255', totalAddresses: 32_768, usableHosts: 32_766, networks: 512 },
+    { bits: 18, cidr: '/18', subnetMask: '255.255.192.0', wildcardMask: '0.0.63.255', totalAddresses: 16_384, usableHosts: 16_382, networks: 1_024 },
+    { bits: 19, cidr: '/19', subnetMask: '255.255.224.0', wildcardMask: '0.0.31.255', totalAddresses: 8_192, usableHosts: 8_190, networks: 2_048 },
+    { bits: 20, cidr: '/20', subnetMask: '255.255.240.0', wildcardMask: '0.0.15.255', totalAddresses: 4_096, usableHosts: 4_094, networks: 4_096 },
+    { bits: 21, cidr: '/21', subnetMask: '255.255.248.0', wildcardMask: '0.0.7.255', totalAddresses: 2_048, usableHosts: 2_046, networks: 8_192 },
+    { bits: 22, cidr: '/22', subnetMask: '255.255.252.0', wildcardMask: '0.0.3.255', totalAddresses: 1_024, usableHosts: 1_022, networks: 16_384 },
+    { bits: 23, cidr: '/23', subnetMask: '255.255.254.0', wildcardMask: '0.0.1.255', totalAddresses: 512, usableHosts: 510, networks: 32_768 },
+    { bits: 24, cidr: '/24', subnetMask: '255.255.255.0', wildcardMask: '0.0.0.255', totalAddresses: 256, usableHosts: 254, networks: 65_536 },
+    { bits: 25, cidr: '/25', subnetMask: '255.255.255.128', wildcardMask: '0.0.0.127', totalAddresses: 128, usableHosts: 126, networks: 131_072 },
+    { bits: 26, cidr: '/26', subnetMask: '255.255.255.192', wildcardMask: '0.0.0.63', totalAddresses: 64, usableHosts: 62, networks: 262_144 },
+    { bits: 27, cidr: '/27', subnetMask: '255.255.255.224', wildcardMask: '0.0.0.31', totalAddresses: 32, usableHosts: 30, networks: 524_288 },
+    { bits: 28, cidr: '/28', subnetMask: '255.255.255.240', wildcardMask: '0.0.0.15', totalAddresses: 16, usableHosts: 14, networks: 1_048_576 },
+    { bits: 29, cidr: '/29', subnetMask: '255.255.255.248', wildcardMask: '0.0.0.7', totalAddresses: 8, usableHosts: 6, networks: 2_097_152 },
+    { bits: 30, cidr: '/30', subnetMask: '255.255.255.252', wildcardMask: '0.0.0.3', totalAddresses: 4, usableHosts: 2, networks: 4_194_304 },
+    { bits: 31, cidr: '/31', subnetMask: '255.255.255.254', wildcardMask: '0.0.0.1', totalAddresses: 2, usableHosts: '2 (P2P)', networks: 8_388_608 },
+    { bits: 32, cidr: '/32', subnetMask: '255.255.255.255', wildcardMask: '0.0.0.0', totalAddresses: 1, usableHosts: 0, networks: 16_777_216 }
+  ];
+  
+  

package/src/esm/lib/util.misc.js

@@ -1,3 +1,5 @@
+import { checkSubnetMask } from "./util.check.js";
+
 /**
  * Adds zero in front of numbers less than 10 and returns as a string.
  * @param {number} num 
@@ -83,7 +85,7 @@ export function scrollIntoView() {
         }, observerOptions);
         for (let i = 0; i < targets.length; i++) {
             observer.observe(targets[i])
-            
+
         }
         allObservers.push(observer);
     }
@@ -111,3 +113,40 @@ export function scrollIntoView() {
         removeAllObservers
     }
 }
+
+export function convertBitsToMask(bits) {
+    try {
+        if (bits < 0 || bits > 32) {
+            throw new Error("Bits must be between 0 and 32");
+        }
+        const mask = (0xffffffff << (32 - bits)) >>> 0;
+        return [
+            (mask >>> 24) & 0xff,
+            (mask >>> 16) & 0xff,
+            (mask >>> 8) & 0xff,
+            mask & 0xff
+        ].join('.');
+    } catch (er) {
+        console.error(er);
+        return;
+    }
+}
+
+export function convertMaskToBits(mask) {
+    try {
+        if (!checkSubnetMask(mask)) {
+            throw new Error("Invalid subnet mask.");
+        }
+        return maskArray
+            .map(num => num.toString(2).padStart(8, '0')) // ['11111111', '11111111', '11111111', '00000000']
+            .join('')                         // '11111111111111111111111100000000'
+            .split('')                        // ['1','1','1',...,'0','0']
+            .filter(bit => bit === '1')       // Keep only the '1's
+            .length;                          // Count them
+    } catch (er) {
+        console.error(er);
+        return;
+    }
+}
+
+

package/src/esm/lib/util.regex.js

@@ -20,6 +20,15 @@ export const regExUrl = new RegExp('^(https?:\\/\\/)?' + // protocol
     '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
     '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
 export const regExEmail = /^[\w-\.]+@([\w-]+\.)+[a-zA-Z]{2,}$/;
+export const regExIpv4 = /^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$/;
+export const regExIpv6 = /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/;
+export const regExMacNoSeparator = /^[0-9a-fA-F]{12}$/;
+export const regExMacHyphenPairs = /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5}$/;
+export const regExMacHyphenQuads = /^[0-9a-fA-F]{4}(-[0-9a-fA-F]{4}){2}$/;
+export const regExMacDotPairs = /^[0-9a-fA-F]{2}(\.[0-9a-fA-F]{2}){5}$/;
+export const regExMacDotQuads = /^[0-9a-fA-F]{4}(\.[0-9a-fA-F]{4}){2}$/;
+export const regExMacColonPairs = /^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}$/;
+export const regExMacColonQuads = /^[0-9a-fA-F]{4}(:[0-9a-fA-F]{4}){2}$/;
 
 /**
  * Removes characters from a string based on a provided regex pattern.