From 61cdfebc8a0a820f5ccd375c7bb36dc70d53dc04 Mon Sep 17 00:00:00 2001
From: Russel Yasol <russel.yasol@wvsu.edu.ph>
Date: Mon, 27 May 2024 22:48:37 +0800
Subject: [PATCH] index refactoring not finish

---
 simpleadmin/www/index.html | 1133 ++++++++----------------------------
 1 file changed, 237 insertions(+), 896 deletions(-)
diff --git a/simpleadmin/www/index.html b/simpleadmin/www/index.html
index d55960a..3c2bbf1 100644
--- a/simpleadmin/www/index.html
+++ b/simpleadmin/www/index.html
@@ -23,7 +23,7 @@
   </head>
   <body>
     <main>
-      <div class="container my-4" x-data="getStaticNetworkInfo()">
+      <div class="container my-4" x-data="processAllInfos()">
         <nav class="navbar navbar-expand-lg mt-2">
           <div class="container-fluid">
             <a class="navbar-brand" href="/"
@@ -116,13 +116,13 @@
                     d="M64 0H242.7c17 0 33.3 6.7 45.3 18.7L365.3 96c12 12 18.7 28.3 18.7 45.3V448c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V64C0 28.7 28.7 0 64 0zM96 192c-17.7 0-32 14.3-32 32v32h64V192H96zM64 352h80 96 80V288H240 144 64v64zM320 224c0-17.7-14.3-32-32-32H256v64h64V224zM160 192v64h64V192H160zM288 448c17.7 0 32-14.3 32-32V384H256v64h32zM160 384v64h64V384H160zM64 416c0 17.7 14.3 32 32 32h32V384H64v32z"
                   />
                 </svg>
-                <h1 class="card-text mt-4" x-text="sim"></h1>
+                <h1 class="card-text mt-4" x-text="simStatus"></h1>
               </div>
               <div class="card-footer">SIM</div>
             </div>
           </div>
 
-          <div class="col align-self-center">
+          <!-- <div class="col align-self-center">
             <div class="card">
               <div
                 class="card-body d-flex flex-column align-items-center justify-content-center"
@@ -142,7 +142,7 @@
               </div>
               <div class="card-footer">Signal Percentage</div>
             </div>
-          </div>
+          </div> -->
 
           <div class="col align-self-center">
             <div class="card">
@@ -160,7 +160,10 @@
                     d="M0 336c0 79.5 64.5 144 144 144H512c70.7 0 128-57.3 128-128c0-61.9-44-113.6-102.4-125.4c4.1-10.7 6.4-22.4 6.4-34.6c0-53-43-96-96-96c-19.7 0-38.1 6-53.3 16.2C367 64.2 315.3 32 256 32C167.6 32 96 103.6 96 192c0 2.7 .1 5.4 .2 8.1C40.2 219.8 0 273.2 0 336z"
                   />
                 </svg>
-                <h1 class="card-text mt-4" x-text="internetConnection"></h1>
+                <h1
+                  class="card-text mt-4"
+                  x-text="internetConnectionStatus"
+                ></h1>
               </div>
               <div class="card-footer">Internet Connection</div>
             </div>
@@ -177,11 +180,11 @@
                     <tbody>
                       <tr>
                         <th scope="row">Active Sim</th>
-                        <td x-text="active_sim"></td>
+                        <td x-text="activeSim"></td>
                       </tr>
                       <tr>
                         <th scope="row">Network Provider</th>
-                        <td x-text="network_provider"></td>
+                        <td x-text="networkProvider"></td>
                       </tr>
                       <tr>
                         <th scope="row">MCCMNC</th>
@@ -193,7 +196,7 @@
                       </tr>
                       <tr>
                         <th scope="row">Network Mode</th>
-                        <td x-text="network_mode"></td>
+                        <td x-text="networkMode"></td>
                       </tr>
                       <tr>
                         <th scope="row">Bands</th>
@@ -261,7 +264,7 @@
             </div>
           </div>
 
-          <div class="col">
+          <!--  <div class="col">
             <div class="card">
               <div class="card-header">Signal Information</div>
               <div class="card-body">
@@ -591,57 +594,30 @@
                 </div>
               </div>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </main>
     <script src="js/dark-mode.js"></script>
+
     <script>
-      function getStaticNetworkInfo() {
+      function processAllInfos() {
         return {
-          sim: "Inactive",
-          atcmd: null,
+          atcmd: "",
+          internetConnectionStatus: "Disconnected",
           temperature: "0",
-          active_sim: "?",
-          network_provider: "?",
-          mccmnc: "?",
-          apn: "?",
-          network_mode: "?",
-          ipv4: "?",
-          ipv6: "?",
-          bands: "?",
-          bandwidth: "?",
-          earfcns: "?",
-          pcc_pci: "?",
-          scc_pci: "-",
-          signalAssessment: "Unknown",
-          csq: "-",
-          rssi: "-",
-          cellID: "?",
-          eNBID: "?",
-          tac: "?",
-          rsrqLTE: "-",
-          rsrqNR: "-",
-          rsrqLTEPercentage: "0%",
-          rsrqNRPercentage: "0%",
-          rsrpLTE: "-",
-          rsrpNR: "-",
-          rsrpLTEPercentage: "0%",
-          rsrpNRPercentage: "0%",
-          sinrLTE: "-",
-          sinrNR: "-",
-          sinrLTEPercentage: "0%",
-          sinrNRPercentage: "0%",
-          signalPercentage: "0",
-          internetConnection: "Disconnected",
-          lastUpdate: new Date().toLocaleString(),
-          newRefreshRate: null,
-          refreshRate: 3,
-          intervalId: null,
-          uptime: "Unknown",
-          fetchNetworkInfo() {
+          simStatus: "No SIM",
+          activeSim: "No SIM",
+          networkProvider: "N/A",
+          mccmnc: "00000",
+          apn: "Unknown",
+          networkMode: "Disconnected",
+          bands: "Unknown Bands",
+          bandwidth: "Unknown Bandwidth",
+
+          fetchAllInfo() {
             this.atcmd =
-              'AT+QTEMP;+QUIMSLOT?;+QSPN;+CGCONTRDP=1;+QMAP="WWANIP";+QENG="servingcell";+QCAINFO';
+              'AT+QTEMP;+QUIMSLOT?;+QSPN;+CGCONTRDP=1;+QMAP="WWANIP";+QENG="servingcell";+QCAINFO;+QSIMSTAT?;+CSQ';
 
             fetch(
               "/cgi-bin/get_atcommand?" +
@@ -649,660 +625,208 @@
                   atcmd: this.atcmd,
                 })
             ).then((response) => {
-              response
-                .text()
-                .then((data) => {
+              response.text().then((data) => {
+                // content here
+                if (data.includes("ERROR")) {
+                  console.log("Error fetching data");
+                  this.activeSim = "Something went wrong.";
+                  return;
+                } else {
                   const rawdata = data;
                   const lines = rawdata.split("\n");
-                  // delete first element of the array
-                  lines.shift();
-                  console.log(lines);
 
-                  // Parse the temperature
-                  const temp1 = lines[15]
+                  // --- Temperature ---
+                  // find this example value from lines "+QTEMP:"cpuss-0-usr","50"
+                  this.temperature = lines
+                    .find((line) => line.includes('+QTEMP:"cpuss-0-usr"'))
                     .split(",")[1]
-                    .replace(/"/g, "")
-                    .trim();
-                  const temp2 = lines[16]
-                    .split(",")[1]
-                    .replace(/"/g, "")
-                    .trim();
-                  // Average the 2 temperatures then add degree symbol
-                  this.temperature = (parseInt(temp1) + parseInt(temp2)) / 2;
-                  // Round the temperature to only show whole numbers
-                  this.temperature = Math.round(this.temperature).toString();
+                    .replace(/"/g, "");
 
-                  // Parse the active sim
-                  this.active_sim = lines[18]
-                    .split(":")[1]
+                  // --- SIM Status ---
+                  // find this example value from lines "+QSIMSTAT: 0,1"
+                  // Only get the last digit of 0,1
+                  const sim_status = lines
+                    .find((line) => line.includes("+QSIMSTAT:"))
+                    .split(" ")[1]
                     .replace(/"/g, "")
-                    .trim();
+                    .split(",")[1];
 
-                  // Parse the network provider
-                  this.network_provider = lines[20]
-                    .split(",")[1]
+                  if (sim_status == 1) {
+                    this.simStatus = "SIM Inserted";
+                  } else if (sim_status == 0) {
+                    this.simStatus = "No SIM";
+                  }
+
+                  // --- Active SIM ---
+                  // find this example value from lines "+QUIMSLOT: 1"
+                  const current_sim = lines
+                    .find((line) => line.includes("+QUIMSLOT:"))
+                    .split(" ")[1]
+                    .replace(/"/g, "");
+
+                  if (current_sim == 1) {
+                    this.activeSim = "SIM 1";
+                  } else if (current_sim == 2) {
+                    this.activeSim = "SIM 2";
+                  } else {
+                    this.activeSim = "No SIM";
+                  }
+
+                  // --- Network Provider ---
+                  // find this example value from lines "+QSPN: \"515 66\",\"515 66\",\"DITO\",0,\"51566\""
+                  // remove any spaces
+                  const network_provider = lines
+                    .find((line) => line.includes("+QSPN:"))
+                    .split(",")[0]
+                    .replace("+QSPN: ", "")
                     .replace(/"/g, "")
                     .replace(/ /g, "");
 
-                  // Check if the network provider is only numbers and no letters
-                  if (this.network_provider.match(/^[0-9]+$/) != null) {
-                    // If it is only numbers, then it is the MCCMNC
-                    this.mccmnc = this.network_provider;
-                    this.network_provider = lines[20]
+                  // if network provider is composed of numbers and spaces, and no letters then use .split(",")[2]
+                  if (network_provider.match(/^[0-9]+$/) != null) {
+                    this.networkProvider = lines
+                      .find((line) => line.includes("+QSPN:"))
                       .split(",")[2]
                       .replace(/"/g, "");
                   } else {
-                    // If it is not only numbers, then it is the network provider
-                    this.mccmnc = lines[20].split(",")[4].replace(/"/g, "");
+                    this.networkProvider = network_provider;
                   }
 
-                  // Parse the APN
-                  this.apn = lines[22].split(",")[2].replace(/"/g, "");
+                  // --- MCCMNC ---
+                  this.mccmnc = lines
+                    .find((line) => line.includes("+QSPN:"))
+                    .split(",")[4]
+                    .replace(/"/g, "");
 
-                  // Parse the WAN IPs
-                  this.ipv4 = lines[24].split(",")[4].replace(/"/g, "");
-                  this.ipv6 = lines[25].split(",")[4].replace(/"/g, "");
+                  // --- APN ---
+                  // find this example value from lines "+CGCONTRDP: 1,0,\"internet.dito.ph\",\"100.65.141.236\",\"36.5.141.64.76.204.39.68.23.210.251.16.49.239.42.149\", \"254.128.0.0.0.0.0.0.0.0.0.0.0.0.0.1\",\"131.226.72.19\",\"131.226.73.19\"\r"
+                  this.apn = lines
+                    .find((line) => line.includes("+CGCONTRDP:"))
+                    .split(",")[2]
+                    .replace(/"/g, "");
 
-                  // If no network IP detected, consider as disconnected. Return all values as unknown (except temperature, sim, network provider, mccmnc, and apn)
-                  if (
-                    this.ipv4 == "0.0.0.0" &&
-                    this.ipv6 == "0:0:0:0:0:0:0:0"
+                  // --- Network Mode ---
+                  // find this example value from lines "+QENG: \"servingcell\",\"NOCONN\",\"NR5G-SA\",\"TDD\",515,66,7000C4001,475,702000,620640,78,12,-83,-3,16,1,-\r"
+
+                  // Use a try and except
+                  try {
+                    const network_mode = lines
+                      .find((line) => line.includes("+QENG:"))
+                      .split(",")[2]
+                      .replace(/"/g, "");
+
+                    if (network_mode == "NR5G-SA") {
+                      this.networkMode = "5G Standalone";
+                    }
+                  } catch (error) {
+                    // find this example value from lines "+QENG: \"LTE\",\"FDD\",515,03,22AE76D,398,1350,3,4,4,BF82,-110,-13,-78,10,6,200,-\r"
+
+                    const network_mode_lte = lines
+                      .find((line) => line.includes("+QENG:"))
+                      .split(",")[1]
+                      .replace(/"/g, "");
+
+                    try {
+                      // find this example value from lines "+QENG: \"NR5G-NSA\",515,03,843,-95,20,-11,528030,41,8,1\r"
+                      const network_mode_5g = lines
+                        .find((line) => line.includes("+QENG:"))
+                        .split(",")[0]
+                        .replace("+QENG: ", "")
+                        .replace(/"/g, "");
+
+                      if (network_mode_5g == "NR5G-NSA") {
+                        this.networkMode = "5G Non-Standalone";
+                      }
+                    } catch (error) {
+                      if (network_mode_lte == "FDD") {
+                        this.networkMode = "4G LTE FDD";
+                      } else if (network_mode_lte == "TDD") {
+                        this.networkMode = "4G LTE TDD";
+                      }
+                    }
+                  }
+
+                  // --- Bands ---
+                  // Get all the values with LTE BAND n (for example, LTE BAND 3, LTE BAND 1) and then store them in an array
+                  const bands = lines.filter((line) =>
+                    line.includes("LTE BAND")
+                  );
+
+                  // since it includes the whole line, we need to extract the band part only
+                  for (let i = 0; i < bands.length; i++) {
+                    bands[i] = bands[i].split(",")[3].replace(/"/g, "");
+                  }
+
+                  // Get all the values with NR BAND n (for example, NR BAND 3, NR BAND 1) and then store them in an array
+                  const bands_5g = lines.filter((line) =>
+                    line.includes("NR5G BAND")
+                  );
+
+                  // since it includes the whole line, we need to extract the band number only
+                  for (let i = 0; i < bands_5g.length; i++) {
+                    bands_5g[i] = bands_5g[i].split(",")[3].replace(/"/g, "");
+                  }
+
+                  // Combine the bands and bands_5g arrays seperated by a comma. however, bands or bands_5g can be empty
+                  if (bands.length > 0 && bands_5g.length > 0) {
+                    this.bands = bands.join(", ") + ", " + bands_5g.join(", ");
+                  } else if (bands.length > 0) {
+                    this.bands = bands.join(", ");
+                  } else if (bands_5g.length > 0) {
+                    this.bands = bands_5g.join(", ");
+                  } else {
+                    this.bands = "No Bands";
+                  }
+
+                  // --- Bandwidth ---
+                  if (this.networkMode == "5G Standalone") {
+                    // find this example value from lines "+QENG: \"servingcell\"
+                    const bandwidth_line = lines.find((line) =>
+                      line.includes("+QENG: \"servingcell\"")
+                    );
+
+                    console.log(bandwidth_line);
+                    const nr_bw = bandwidth_line.split(",")[11];
+                    const calculated_bandwidth = this.calculate_nr_bw(nr_bw);
+                    this.bandwidth = "NR " + calculated_bandwidth + " MHz";
+                  } else if (
+                    this.networkMode == "4G LTE FDD" ||
+                    this.networkMode == "4G LTE TDD"
                   ) {
-                    this.temperature = this.temperature;
-                    this.active_sim = this.active_sim;
-                    this.network_provider = this.network_provider;
-                    this.mccmnc = this.mccmnc;
-                    this.apn = this.apn;
-                    this.network_mode =
-                      "Network Disconnected. Please check your SIM card and network settings.";
-                    this.bands = "Unknown";
-                    this.bandwidth = "Unknown";
-                    this.earfcns = "Unknown";
-                    this.pcc_pci = "Unknown";
-                    this.scc_pci = "Unknown";
-                    this.csq = "Unknown";
-                    this.rssi = "Unknown";
-                    this.cellID = "Unknown";
-                    this.eNBID = "Unknown";
-                    this.tac = "Unknown";
-                    this.rsrqLTE = "Unknown";
-                    this.rsrqNR = "Unknown";
-                    this.rsrqLTEPercentage = "0%";
-                    this.rsrqNRPercentage = "0%";
-                    this.rsrpLTE = "Unknown";
-                    this.rsrpNR = "Unknown";
-                    this.rsrpLTEPercentage = "0%";
-                    this.rsrpNRPercentage = "0%";
-                    this.sinrLTE = "Unknown";
-                    this.sinrNR = "Unknown";
-                    this.sinrLTEPercentage = "0%";
-                    this.sinrNRPercentage = "0%";
-                    this.signalPercentage = "0";
-                    this.internetConnection = "Disconnected";
-                    this.lastUpdate = new Date().toLocaleString();
-                    return;
-                  }
+                    // find this example value from lines "+QENG: \"servingcell\"
+                    const bandwidth_line = lines.find((line) =>
+                      line.includes("+QENG: \"servingcell\"")
+                    );
 
-                  // Parse the network mode
-                  const networkMode1 = lines[27].split(",")[2];
+                    const lte_bw_ul = bandwidth_line.split(",")[10];
+                    const lte_bw_dl = bandwidth_line.split(",")[11];
+                    const calculated_bandwidth_ul = this.calculate_lte_bw(lte_bw_ul);
+                    const calculated_bandwidth_dl = this.calculate_lte_bw(lte_bw_dl);
+                    this.bandwidth = calculated_bandwidth_ul + " / " + calculated_bandwidth_dl + " MHz";
+                  } else if (this.networkMode == "5G Non-Standalone") {
+                    // find this example value from lines "+QENG: \"LTE\" for LTE
+                    const lte_bandwidth_line = lines.find((line) =>
+                      line.includes("+QENG: \"LTE\"")
+                    );
 
-                  if (networkMode1 === '"NR5G-SA"') {
-                    this.network_mode = networkMode1;
-                    this.network_mode = this.network_mode.replace(/"/g, "");
+                    const lte_bw_ul = lte_bandwidth_line.split(",")[8];
+                    const lte_bw_dl = lte_bandwidth_line.split(",")[9];
+
+                    const calculated_bandwidth_ul = this.calculate_lte_bw(lte_bw_ul);
+                    const calculated_bandwidth_dl = this.calculate_lte_bw(lte_bw_dl);
+
+
+
+                    const nr_bw = bandwidth_line.split(",")[9];
+                    const calculated_bandwidth = this.calculate_nr_bw(nr_bw);
+
+                    // combine the bandwidths
+                    this.bandwidth = "NR " + calculated_bandwidth + " MHz, " + calculated_bandwidth_ul + " / " + calculated_bandwidth_dl + " MHz";
                   } else {
-                    let networkMode2, networkMode3;
-
-                    if (
-                      lines[27] !== undefined &&
-                      lines[27] !== "OK" &&
-                      lines[27] !== "" &&
-                      lines[27] !== "/r"
-                    ) {
-                      // Check if lines[27] doesnt have TDD or FDD
-                      if (
-                        lines[27].match(/FDD/) != null ||
-                        lines[27].match(/TDD/) != null
-                      ) {
-                        networkMode2 = lines[27]
-                          .split(",")[2]
-                          .replace(/"/g, "");
-                        networkMode2 = networkMode2.split(",")[0].trim();
-                      }
-
-                      if (networkMode2 !== "LTE") {
-                        networkMode2 = lines[28]
-                          .split(":")[1]
-                          .replace(/"/g, "");
-                        networkMode2 = networkMode2.split(",")[0];
-
-                        if (
-                          lines[29] !== undefined &&
-                          lines[29] !== "OK" &&
-                          lines[29] !== ""
-                        ) {
-                          networkMode3 = lines[29]
-                            .split(":")[1]
-                            .split(",")[0]
-                            .replace(/"/g, "");
-                          networkMode3 = networkMode3.split(",")[0];
-                        }
-                      }
-                    }
-
-                    // Check if networkMode3 is not empty
-                    if (networkMode3 !== undefined) {
-                      this.network_mode = networkMode2 + ", " + networkMode3;
-                    } else {
-                      this.network_mode = networkMode2;
-                    }
+                    this.bandwidth = "Unknown Bandwidth";
                   }
-
-                  // Parse the bands
-                  let bands = [];
-                  let earfcns = [];
-                  let earfcnValues;
-                  let bandValues;
-
-                  // get lines length
-                  const linesLength = lines.length;
-
-                  // Only lines 31 - 35 have the bands information
-                  for (let i = 29; i <= 35; i++) {
-                    if (i < linesLength) {
-                      // Check if the line is not "OK" or empty
-                      if (lines[i] !== "OK" && lines[i] !== "") {
-                        bandValues = lines[i].split(",")[3];
-                        earfcnValues = lines[i].split(",")[1];
-                        // If bandvalues is only numbers and no letters or undefined, then move to the next line
-                        if (bandValues !== undefined) {
-                          if (bandValues.match(/^[0-9]+$/) != null) {
-                            continue;
-                          } else {
-                            bandValues = bandValues.replace(/"/g, "");
-                            earfcnValues = earfcnValues.replace(/"/g, "");
-                            earfcns.push(earfcnValues);
-                            bands.push(bandValues);
-                          }
-                        } else {
-                          continue;
-                        }
-                      } else {
-                        continue;
-                      }
-                    } else {
-                      break;
-                    }
-                  }
-
-                  // Convert bands to a single string seperated by a comma
-                  this.bands = bands.join(", ");
-                  this.earfcns = earfcns.join(", ");
-
-                  // Parse the bandwidth
-                  if (this.network_mode === "NR5G-SA") {
-                    let nr_bw = lines[27].split(",")[11].replace(/"/g, "");
-                    nr_bw = parseInt(nr_bw);
-
-                    // Calculate the NR bandwidth
-                    this.bandwidth =
-                      "NR " + this.calculate_nr_bw(nr_bw).toString() + " MHz";
-
-                    // Parse the PCIs
-                    this.pcc_pci = lines[27].split(",")[7].replace(/"/g, "");
-                    //TODO: Add the scc_pci for NR-CA SA later
-
-                    // Parse the Cell ID
-                    const longCID = lines[27].split(",")[6].replace(/"/g, "");
-
-                    // Get the eNBID. Its just Cell ID minus the last 2 characters
-                    this.eNBID = longCID.substring(0, longCID.length - 2);
-
-                    // Get the short Cell ID (Last 2 characters of the Cell ID)
-                    const shortCID = longCID.substring(longCID.length - 2);
-
-                    // Get the TAC
-                    this.tac = lines[27].split(",")[8].replace(/"/g, "");
-
-                    this.cellID =
-                      "Short " +
-                      shortCID +
-                      "(" +
-                      parseInt(shortCID, 16) +
-                      ")" +
-                      ", " +
-                      "Long " +
-                      longCID +
-                      "(" +
-                      parseInt(longCID, 16) +
-                      ")";
-
-                    // Get the RSRQ
-                    this.rsrqNR = lines[27].split(",")[13].replace(/"/g, "");
-                    let rsrq = parseInt(this.rsrqNR);
-
-                    // Calculate the RSRQ percentage
-                    this.rsrqNRPercentage = this.calculateRSRQPercentage(rsrq);
-
-                    // Get the RSRP
-                    this.rsrpNR = lines[27].split(",")[12].replace(/"/g, "");
-
-                    // Calculate the RSRP percentage
-                    this.rsrpNRPercentage = this.calculateRSRPPercentage(
-                      parseInt(this.rsrpNR)
-                    );
-
-                    // Get the SINR
-                    this.sinrNR = lines[27].split(",")[14].replace(/"/g, "");
-
-                    // Calculate the SINR percentage
-                    this.sinrNRPercentage = this.calculateSINRPercentage(
-                      parseInt(this.sinrNR)
-                    );
-
-                    // Calculate Signal Percentage
-                    this.signalPercentage = this.calculateSignalPercentage(
-                      parseInt(this.rsrpNRPercentage),
-                      parseInt(this.sinrNRPercentage)
-                    );
-
-                    // Get the Signal Assessment
-                    this.signalAssessment = this.signalQuality(
-                      this.signalPercentage
-                    );
-                  } else {
-                    if (
-                      this.network_mode.match(/LTE/) != null &&
-                      this.network_mode.match(/NR5G-NSA/) == null
-                    ) {
-                      let lte_bw_ul = lines[27]
-                        .split(",")[10]
-                        .replace(/"/g, "");
-                      let lte_bw_dl = lines[27]
-                        .split(",")[11]
-                        .replace(/"/g, "");
-
-                      lte_bw_dl = parseInt(lte_bw_dl);
-                      lte_bw_ul = parseInt(lte_bw_ul);
-
-                      // Calculate the LTE bandwidth
-                      this.bandwidth =
-                        "UL " +
-                        this.calculate_lte_bw(lte_bw_ul) +
-                        " MHz / " +
-                        "DL " +
-                        this.calculate_lte_bw(lte_bw_dl) +
-                        " MHz";
-
-                      // Get the Cell ID
-                      const longCID = lines[27].split(",")[6].replace(/"/g, "");
-
-                      // Get the eNBID. Its just Cell ID minus the last 2 characters
-                      this.eNBID = longCID.substring(0, longCID.length - 2);
-
-                      // Get the short Cell ID (Last 2 characters of the Cell ID)
-                      const shortCID = longCID.substring(longCID.length - 2);
-
-                      // Get the TAC
-                      this.tac = lines[27].split(",")[12].replace(/"/g, "");
-                      this.tac = this.tac + " (" + parseInt(this.tac, 16) + ")";
-
-                      this.cellID =
-                        "Short " +
-                        shortCID +
-                        "(" +
-                        parseInt(shortCID, 16) +
-                        ")" +
-                        ", " +
-                        "Long " +
-                        longCID +
-                        "(" +
-                        parseInt(longCID, 16) +
-                        ")";
-
-                      // Parse the PCIs
-                      this.pcc_pci = lines[27].split(",")[7].replace(/"/g, "");
-
-                      // Get the RSRQ
-                      this.rsrqLTE = lines[27].split(",")[14].replace(/"/g, "");
-                      let rsrq = parseInt(this.rsrqLTE);
-
-                      // Calculate the RSRQ percentage
-                      this.rsrqLTEPercentage =
-                        this.calculateRSRQPercentage(rsrq);
-
-                      // Get the RSRP
-                      this.rsrpLTE = lines[27].split(",")[13].replace(/"/g, "");
-
-                      // Calculate the RSRP percentage
-                      this.rsrpLTEPercentage = this.calculateRSRPPercentage(
-                        parseInt(this.rsrpLTE)
-                      );
-
-                      // Get the RSSI
-                      this.rssi = lines[27].split(",")[15].replace(/"/g, "");
-
-                      // Get the SINR
-                      this.sinrLTE = lines[27].split(",")[16].replace(/"/g, "");
-
-                      // Calculate the SINR percentage
-                      this.sinrLTEPercentage = this.calculateSINRPercentage(
-                        parseInt(this.sinrLTE)
-                      );
-
-                      // Calculate Signal Percentage
-                      this.signalPercentage = this.calculateSignalPercentage(
-                        parseInt(this.rsrpLTEPercentage),
-                        parseInt(this.sinrLTEPercentage)
-                      );
-
-                      // Get the Signal Assessment
-                      this.signalAssessment = this.signalQuality(
-                        this.signalPercentage
-                      );
-                    }
-
-                    if (this.network_mode.match(/NR5G-NSA/) != null) {
-                      let lte_bw_ul = lines[28].split(",")[8].replace(/"/g, "");
-                      let lte_bw_dl = lines[28].split(",")[9].replace(/"/g, "");
-
-                      lte_bw_dl = parseInt(lte_bw_dl);
-                      lte_bw_ul = parseInt(lte_bw_ul);
-
-                      // Calculate the LTE bandwidth
-                      this.bandwidth =
-                        "UL " +
-                        this.calculate_lte_bw(lte_bw_ul) +
-                        " MHz / " +
-                        "DL " +
-                        this.calculate_lte_bw(lte_bw_dl) +
-                        " MHz";
-
-                      // Get the RSSI
-                      this.rssi = lines[28].split(",")[13].replace(/"/g, "");
-
-                      // Get the Cell ID
-                      const longCID = lines[28].split(",")[4].replace(/"/g, "");
-
-                      // Get the eNBID. Its just Cell ID minus the last 2 characters
-                      this.eNBID = longCID.substring(0, longCID.length - 2);
-
-                      // Get the short Cell ID (Last 2 characters of the Cell ID)
-                      const shortCID = longCID.substring(longCID.length - 2);
-
-                      // Get the TAC
-                      this.tac = lines[28].split(",")[10].replace(/"/g, "");
-                      this.tac = this.tac + " (" + parseInt(this.tac, 16) + ")";
-
-                      this.cellID =
-                        "Short " +
-                        shortCID +
-                        "(" +
-                        parseInt(shortCID, 16) +
-                        ")" +
-                        ", " +
-                        "Long " +
-                        longCID +
-                        "(" +
-                        parseInt(longCID, 16) +
-                        ")";
-
-                      // Parse the PCIs
-                      this.pcc_pci = lines[28].split(",")[5].replace(/"/g, "");
-
-                      // Get the RSRQ
-                      this.rsrqLTE = lines[28].split(",")[12].replace(/"/g, "");
-                      let rsrq = parseInt(this.rsrqLTE);
-
-                      // Calculate the RSRQ percentage
-                      this.rsrqLTEPercentage =
-                        this.calculateRSRQPercentage(rsrq);
-
-                      // Get the RSRP
-                      this.rsrpLTE = lines[28].split(",")[11].replace(/"/g, "");
-
-                      // Calculate the RSRP percentage
-                      this.rsrpLTEPercentage = this.calculateRSRPPercentage(
-                        parseInt(this.rsrpLTE)
-                      );
-
-                      // Get the SINR
-                      this.sinrLTE = lines[28].split(",")[14].replace(/"/g, "");
-
-                      // Calculate the SINR percentage
-                      this.sinrLTEPercentage = this.calculateSINRPercentage(
-                        parseInt(this.sinrLTE)
-                      );
-
-                      // Calculate Signal Percentage
-                      this.signalPercentage = this.calculateSignalPercentage(
-                        parseInt(this.rsrpLTEPercentage),
-                        parseInt(this.sinrLTEPercentage)
-                      );
-
-                      // Get the Signal Assessment
-                      this.signalAssessment = this.signalQuality(
-                        this.signalPercentage
-                      );
-
-                      let nr_bw = lines[29].split(",")[9].replace(/"/g, "");
-
-                      nr_bw = parseInt(nr_bw);
-
-                      // Calculate the NR bandwidth
-                      this.bandwidth +=
-                        " / NR " +
-                        this.calculate_nr_bw(nr_bw).toString() +
-                        " MHz";
-
-                      // Parse the PCIs
-                      this.pcc_pci = lines[28].split(",")[5].replace(/"/g, "");
-                      this.scc_pci = lines[29].split(",")[3].replace(/"/g, "");
-
-                      // Get the RSSI
-                      this.rssi = lines[28].split(",")[13].replace(/"/g, "");
-
-                      // Get the RSRQ NR
-                      this.rsrqNR = lines[29].split(",")[6].replace(/"/g, "");
-                      rsrq = parseInt(this.rsrqNR);
-
-                      // Calculate the RSRQ percentage
-                      this.rsrqNRPercentage =
-                        this.calculateRSRQPercentage(rsrq);
-
-                      // Get the RSRP NR
-                      this.rsrpNR = lines[29].split(",")[4].replace(/"/g, "");
-
-                      // Calculate the RSRP percentage
-                      this.rsrpNRPercentage = this.calculateRSRPPercentage(
-                        parseInt(this.rsrpNR)
-                      );
-
-                      // Get the SINR NR
-                      this.sinrNR = lines[29].split(",")[5].replace(/"/g, "");
-
-                      // Calculate the SINR percentage
-                      this.sinrNRPercentage = this.calculateSINRPercentage(
-                        parseInt(this.sinrNR)
-                      );
-
-                      // Calculate Signal Percentage
-                      const nrSignalPercentage = this.calculateSignalPercentage(
-                        parseInt(this.rsrpNRPercentage),
-                        parseInt(this.sinrNRPercentage)
-                      );
-
-                      // Get the average of the LTE and NR Signal Percentage
-                      this.signalPercentage =
-                        (this.signalPercentage + nrSignalPercentage) / 2;
-
-                      // Round the signalPercentage value
-                      this.signalPercentage = Math.round(this.signalPercentage);
-
-                      // Get the Signal Assessment
-                      this.signalAssessment = this.signalQuality(
-                        this.signalPercentage
-                      );
-                    }
-                  }
-                })
-                .then(() => {
-                  if (this.network_mode !== "NR5G-SA") {
-                    this.atcmd = "AT+CSQ";
-                    fetch(
-                      "/cgi-bin/get_atcommand?" +
-                        new URLSearchParams({
-                          atcmd: this.atcmd,
-                        })
-                    ).then((response) => {
-                      response.text().then((data) => {
-                        const rawdata = data;
-
-                        const lines = rawdata.split("\n");
-                        console.log("CSQ: ", lines);
-
-                        this.csq = lines[1].split(":")[1].split(",")[0].trim();
-                      });
-                    });
-                  }
-                });
-            });
-          },
-
-          calculate_lte_bw(lte_bw) {
-            switch (true) {
-              case 0:
-                return 1.4;
-              case 1:
-                return 3;
-              // Now case 2 - 5
-              case lte_bw >= 2 && lte_bw <= 5:
-                return (lte_bw - 1) * 5;
-              default:
-                return "-";
-            }
-          },
-
-          calculate_nr_bw(nr_bw) {
-            switch (true) {
-              case nr_bw >= 0 && nr_bw <= 5:
-                return (nr_bw + 1) * 5;
-              case nr_bw >= 6 && nr_bw <= 12:
-                return (nr_bw - 2) * 10;
-              case nr_bw === 13:
-                return "200";
-              case nr_bw === 14:
-                return "400";
-              default:
-                return "-";
-            }
-          },
-
-          calculateRSRQPercentage(rsrq) {
-            let RSRQ_min = -20;
-            let RSRQ_max = -8;
-
-            // If rsrq is null, return 0%
-            if (isNaN(rsrq) || rsrq < -20) {
-              return 0;
-            }
-
-            let percentage = ((rsrq - RSRQ_min) / (RSRQ_max - RSRQ_min)) * 100;
-
-            if (percentage > 100) {
-              percentage = 100;
-            }
-
-            return Math.round(percentage);
-          },
-
-          calculateRSRPPercentage(rsrp) {
-            let RSRP_min = -140;
-            let RSRP_max = -60;
-
-            // If rsrp is null, return 0%
-            if (isNaN(rsrp) || rsrp < -140) {
-              return 0;
-            }
-
-            let percentage = ((rsrp - RSRP_min) / (RSRP_max - RSRP_min)) * 100;
-
-            if (percentage > 100) {
-              percentage = 100;
-            }
-
-            return Math.round(percentage);
-          },
-
-          calculateSINRPercentage(sinr) {
-            let SINR_min = -10; // Changed from 0
-            let SINR_max = 35;
-
-            // If sinr is null, return 0%
-            if (isNaN(sinr) || sinr < -10) {
-              return 0;
-            }
-
-            let percentage = ((sinr - SINR_min) / (SINR_max - SINR_min)) * 100;
-
-            if (percentage > 100) {
-              percentage = 100;
-            }
-
-            return Math.round(percentage);
-          },
-
-          // Calculate the overall signal assessment
-          calculateSignalPercentage(rsrpNRPercentage, sinrNRPercentage) {
-            // Get the average of the RSRP Percentage and SINR Percentage
-            let average = (rsrpNRPercentage + sinrNRPercentage) / 2;
-            return Math.round(average);
-          },
-
-          signalQuality(percentage) {
-            if (percentage >= 80) {
-              return "Excellent";
-            } else if (percentage >= 60) {
-              return "Good";
-            } else if (percentage >= 40) {
-              return "Fair";
-            } else if (percentage >= 0) {
-              return "Poor";
-            } else {
-              return "No Signal";
-            }
-          },
-
-          fetchSIMInfo() {
-            this.atcmd = "AT+QSIMSTAT?";
-
-            fetch(
-              "/cgi-bin/get_atcommand?" +
-                new URLSearchParams({
-                  atcmd: this.atcmd,
-                })
-            ).then((response) => {
-              response
-                .text()
-                .then((data) => {
-                  const rawdata = data;
-
-                  const lines = rawdata.split("\n");
-                  console.log("SIM: ", lines);
-
-                  const sim_status = lines[1]
-                    .split(":")[1]
-                    .split(",")[1]
-                    .trim();
-                  if (sim_status === "1") {
-                    this.sim = "Active";
-                  } else {
-                    this.sim = "Inactive";
-                  }
-                  console.log("SIM: ", this.sim);
-                })
-                .then(() => {
-                  this.fetchNetworkInfo();
-                });
+                }
+              });
             });
           },
 
@@ -1319,238 +843,55 @@
               });
           },
 
-          fetchUpTime() {
-            // Content-Type: text/plain
-            //
-            // 1 hour 44, minute
-            fetch("/cgi-bin/get_uptime")
-              .then((response) => response.text())
-              .then((data) => {
-                // Example result
-                // 01:17:02 up 3 days,  2:41,  load average: 0.65, 0.66, 0.60
-
-                // Look for xx days in the result
-                const days = data.match(/(\d+) day/);
-                // Do the same for hours
-                const hours = data.match(/(\d+) hour/);
-                // Do the same for minutes
-                const minutes = data.match(/(\d+) min/);
-                // 2:41
-                const hoursAndMinutes = data.match(/(\d+):(\d+),/);
-
-                if (hoursAndMinutes != null) {
-                  if (days != null) {
-                    if (days[1] === "1") {
-                      if (hoursAndMinutes[1] === "1") {
-                        this.uptime =
-                          days[1] +
-                          " day, " +
-                          hoursAndMinutes[1] +
-                          " hour " +
-                          hoursAndMinutes[2] +
-                          " minutes";
-                      } else if (hoursAndMinutes[2] === 1) {
-                        this.uptime =
-                          days[1] +
-                          " day, " +
-                          hoursAndMinutes[1] +
-                          " hours " +
-                          hoursAndMinutes[2] +
-                          " minute";
-                      } else {
-                        this.uptime =
-                          days[1] +
-                          " day, " +
-                          hoursAndMinutes[1] +
-                          " hours " +
-                          hoursAndMinutes[2] +
-                          " minutes";
-                      }
-                    } else {
-                      if (hoursAndMinutes[1] === "1") {
-                        this.uptime =
-                          days[1] +
-                          " days, " +
-                          hoursAndMinutes[1] +
-                          " hour " +
-                          hoursAndMinutes[2] +
-                          " minutes";
-                      } else if (hoursAndMinutes[2] === 1) {
-                        this.uptime =
-                          days[1] +
-                          " days, " +
-                          hoursAndMinutes[1] +
-                          " hours " +
-                          hoursAndMinutes[2] +
-                          " minute";
-                      } else {
-                        this.uptime =
-                          days[1] +
-                          " days, " +
-                          hoursAndMinutes[1] +
-                          " hours " +
-                          hoursAndMinutes[2] +
-                          " minutes";
-                      }
-                    }
-                  } else {
-                    if (hoursAndMinutes[1] === "1") {
-                      this.uptime =
-                        hoursAndMinutes[1] +
-                        " hour " +
-                        hoursAndMinutes[2] +
-                        " minutes";
-                    } else if (hoursAndMinutes[2] === 1) {
-                      this.uptime =
-                        hoursAndMinutes[1] +
-                        " hours " +
-                        hoursAndMinutes[2] +
-                        " minute";
-                    } else {
-                      this.uptime =
-                        hoursAndMinutes[1] +
-                        " hours " +
-                        hoursAndMinutes[2] +
-                        " minutes";
-                    }
-                  }
-                } else if (days != null) {
-                  if (hours != null) {
-                    if (days[1] === "1") {
-                      if (hours[1] === "1") {
-                        this.uptime = days[1] + " day, " + hours[1] + " hour";
-                      } else {
-                        this.uptime = days[1] + " day, " + hours[1] + " hours";
-                      }
-                    } else {
-                      if (hours[1] === "1") {
-                        this.uptime = days[1] + " days, " + hours[1] + " hour";
-                      } else {
-                        this.uptime = days[1] + " days, " + hours[1] + " hours";
-                      }
-                    }
-                  } else if (minutes != null) {
-                    if (days[1] === "1") {
-                      if (minutes[1] === "1") {
-                        this.uptime =
-                          days[1] + " day, " + minutes[1] + " minute";
-                      } else {
-                        this.uptime =
-                          days[1] + " day, " + minutes[1] + " minutes";
-                      }
-                    } else {
-                      if (minutes[1] === "1") {
-                        this.uptime =
-                          days[1] + " days, " + minutes[1] + " minute";
-                      } else {
-                        this.uptime =
-                          days[1] + " days, " + minutes[1] + " minutes";
-                      }
-                    }
-                  } else {
-                    if (days[1] === "1") {
-                      this.uptime = days[1] + " day";
-                    } else {
-                      this.uptime = days[1] + " days";
-                    }
-                  }
-                } else if (hours != null) {
-                  if (hours[1] === "1") {
-                    this.uptime = hours[1] + " hour";
-                  } else {
-                    this.uptime = hours[1] + " hours";
-                  }
-                } else if (minutes != null) {
-                  if (minutes[1] === "1") {
-                    this.uptime = minutes[1] + " minute";
-                  } else {
-                    this.uptime = minutes[1] + " minutes";
-                  }
-                } else {
-                  this.uptime = "Unknown Time";
-                }
-              });
+          calculate_lte_bw(lte_bw) {
+            switch (true) {
+              case 0:
+                return 1.4;
+              case 1:
+                return 3;
+              // Now case 2 - 5
+              case lte_bw >= 2 && lte_bw <= 5:
+                return (lte_bw - 1) * 5;
+              default:
+                return "Unknown";
+            }
           },
 
-          updateRefreshRate() {
-            // Check if the refresh rate is less than 3
-            if (this.newRefreshRate < 3) {
-              this.newRefreshRate = 3;
+          calculate_nr_bw(nr_bw) {
+            switch (true) {
+              case nr_bw >= 0 && nr_bw <= 5:
+                return (nr_bw + 1) * 5;
+              case nr_bw >= 6 && nr_bw <= 12:
+                return (nr_bw - 2) * 10;
+              case nr_bw === 13:
+                return "200";
+              case nr_bw === 14:
+                return "400";
+              default:
+                return "Unknown";
             }
-
-            // Clear the old interval
-            clearInterval(this.intervalId);
-
-            // Set the refresh rate
-            this.refreshRate = this.newRefreshRate;
-            console.log("Refresh Rate Updated to " + this.refreshRate);
-
-            // Store the refresh rate in local storage or session storage
-            localStorage.setItem("refreshRate", this.refreshRate);
-
-            // Initialize with the new refresh rate
-            this.init();
           },
 
           init() {
-            // Retrieve the refresh rate from local storage or session storage
-            const storedRefreshRate = localStorage.getItem("refreshRate");
-
-            // If a refresh rate is stored, use it; otherwise, use a default value
-            this.refreshRate = storedRefreshRate
-              ? parseInt(storedRefreshRate)
-              : 3; // Change 5 to your desired default value
-
-            // Ensure fetchSIMInfo returns a promise
-            this.fetchSIMInfo();
+            this.fetchAllInfo();
 
             this.requestPing()
               .then((data) => {
                 const response = data.trim();
                 // Trim any leading/trailing spaces
                 if (response === "OK") {
-                  this.internetConnection = "Connected";
+                  this.internetConnectionStatus = "Connected";
                 } else {
-                  this.internetConnection = "Disconnected";
+                  this.internetConnectionStatus = "Disconnected";
                 }
               })
               .catch((error) => {
                 console.error("Error:", error);
-                this.internetConnection = "Disconnected";
+                this.internetConnectionStatus = "Disconnected";
               });
-
-            this.fetchUpTime();
-
-            this.lastUpdate = new Date().toLocaleString();
-            console.log("Initialized");
-
-            // Set the refresh rate
-            this.intervalId = setInterval(() => {
-              this.fetchSIMInfo();
-
-              this.requestPing()
-                .then((data) => {
-                  const response = data.trim();
-                  // Trim any leading/trailing spaces
-                  if (response === "OK") {
-                    this.internetConnection = "Connected";
-                  } else {
-                    this.internetConnection = "Disconnected";
-                  }
-                })
-                .catch((error) => {
-                  console.error("Error:", error);
-                  this.internetConnection = "Disconnected";
-                });
-
-              this.fetchUpTime();
-
-              this.lastUpdate = new Date().toLocaleString();
-              console.log("Refreshed");
-            }, this.refreshRate * 1000);
           },
         };
       }
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
