fixed file dir locations

This commit is contained in:
Russel Yasol
2024-05-08 15:25:46 +08:00
parent 41ee583c8d
commit 5369e15a84
28 changed files with 137 additions and 3988 deletions

View File

@@ -16,8 +16,8 @@ fi
MYATCMD=$(printf '%b\n' "${atcmd//%/\\x}")
if [ -n "${MYATCMD}" ]; then
x=$(urldecode "$atcmd")
# Initialize wait time to 1 second
wait_time=1000
# Initialize wait time to 200 ms
wait_time=200
while true; do
runcmd=$(echo -en "$x\r\n" | microcom -t $wait_time /dev/ttyOUT2)
# Check if "OK" or "ERROR" is present in the response

View File

@@ -1,7 +1,7 @@
#!/bin/bash
# Check iptables for ttlvalue
ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}' | head -n1)
ttlvalue=$(iptables -t mangle -vnL | awk '/TTL/ {print $13; exit}')
ttlenabled=true;
# Set Variables
@@ -17,4 +17,4 @@ cat <<EOT
"isEnabled": $ttlenabled,
"ttl": $ttlvalue
}
EOT
EOT

View File

@@ -1,5 +1,5 @@
#!/bin/bash
PATH=/bin:/usr/sbin:/usr/bin:/sbin:/opt/sbin:/opt/bin:/usrdata/root/bin
# Get query
QUERY_STRING=$(echo "${QUERY_STRING}" | sed 's/;//g')
@@ -22,28 +22,28 @@ setTTL=$(printf '%b\n' "${ttlvalue//%/\\x}")
if [ -n "${setTTL}" ]; then
# Stop Service To Remove Rules
/opt/bin/sudo /usrdata/simplefirewall/ttl-override stop
/usrdata/simplefirewall/ttl-override stop
# Check iptables is still set
ttlcheck=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}')
ttlcheck=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
# If TTL is still set manually remove values
if [ ! -z "${ttlcheck}" ]; then
/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
/opt/bin/sudo /usr/sbin/ip6tables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
if [ !-z "${ttlcheck}" ]; then
iptables -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true
ip6tables -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true
fi
# Echo TTL to file
echo $setTTL > /usrdata/simplefirewall/ttlvalue
# Set Start Service
/opt/bin/sudo /usrdata/simplefirewall/ttl-override start
/usrdata/simplefirewall/ttl-override start
fi
# Check iptables for ttlvalue
ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}')
ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}')
ttlenabled=true;
# Set Variables
@@ -58,5 +58,4 @@ cat <<EOT
{
"isEnabled": $ttlenabled,
"ttl": $ttlvalue
}
EOT
}

View File

@@ -52,18 +52,19 @@
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="/deviceinfo.html" aria-current="page" >Device Information</a>
<a
class="nav-link active"
href="/deviceinfo.html"
aria-current="page"
>Device Information</a
>
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>

View File

@@ -40,7 +40,9 @@
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/">Home</a>
<a class="nav-link active" aria-current="page" href="/"
>Home</a
>
</li>
<li class="nav-item">
<a class="nav-link" href="network.html">Simple Network</a>
@@ -52,18 +54,16 @@
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html">Device Information</a>
</li>
<a class="nav-link" href="/deviceinfo.html"
>Device Information</a
>
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>
@@ -272,7 +272,6 @@
}
} }"
>
<div
x-show="rsrqLTE != '-'"
class="progress w-100"
@@ -287,7 +286,9 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrqLTEPercentage + '%'"
>
<span x-text="rsrqLTE + ' / ' + rsrqLTEPercentage + '%'"></span>
<span
x-text="rsrqLTE + ' / ' + rsrqLTEPercentage + '%'"
></span>
</div>
</div>
</td>
@@ -322,7 +323,9 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrqNRPercentage + '%'"
>
<span x-text="rsrqNR + ' / ' + rsrqNRPercentage + '%'"></span>
<span
x-text="rsrqNR + ' / ' + rsrqNRPercentage + '%'"
></span>
</div>
</div>
</td>
@@ -360,7 +363,9 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrpLTEPercentage + '%'"
>
<span x-text="rsrpLTE + ' / ' + rsrpLTEPercentage + '%'"></span>
<span
x-text="rsrpLTE + ' / ' + rsrpLTEPercentage + '%'"
></span>
</div>
</div>
</td>
@@ -398,7 +403,9 @@
:class="getProgressBarClass()"
:style="'width: ' + rsrpNRPercentage + '%'"
>
<span x-text="rsrpNR + ' / ' + rsrpNRPercentage + '%'"></span>
<span
x-text="rsrpNR + ' / ' + rsrpNRPercentage + '%'"
></span>
</div>
</div>
</td>
@@ -436,7 +443,9 @@
:class="getProgressBarClass()"
:style="'width: ' + sinrLTEPercentage +'%'"
>
<span x-text="sinrLTE + ' / ' + sinrLTEPercentage +'%'"></span>
<span
x-text="sinrLTE + ' / ' + sinrLTEPercentage +'%'"
></span>
</div>
</div>
</td>
@@ -474,7 +483,9 @@
:class="getProgressBarClass()"
:style="'width: ' + sinrNRPercentage +'%'"
>
<span x-text="sinrNR + ' / ' + sinrNRPercentage +'%'"></span>
<span
x-text="sinrNR + ' / ' + sinrNRPercentage +'%'"
></span>
</div>
</div>
</td>
@@ -543,7 +554,7 @@
internetConnection: "Disconnected",
lastUpdate: new Date().toLocaleString(),
newRefreshRate: null,
refreshRate: 3,
refreshRate: 30,
intervalId: null,
fetchNetworkInfo() {
this.atcmd =
@@ -607,21 +618,43 @@
if (networkMode1 === '"NR5G-SA"') {
this.network_mode = networkMode1;
this.network_mode = this.network_mode.replace(/"/g, "");
} else {
}
else {
let networkMode2, networkMode3;
networkMode2 = lines[28].split(":")[1].replace(/"/g, "");
networkMode2 = networkMode2.split(",")[0];
if (
lines[29] !== undefined &&
lines[29] !== "OK" &&
lines[29] !== ""
lines[27] !== undefined &&
lines[27] !== "OK" &&
lines[27] !== "" &&
lines[27] !== "/r"
) {
networkMode3 = lines[29].split(":")[1].replace(/"/g, "");
networkMode3 = networkMode3.split(",")[0];
// 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();
console.log(networkMode2);
}
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];
}
}
}
console.log(networkMode2, networkMode3);
// Check if networkMode3 is not empty
if (networkMode3 !== undefined) {
this.network_mode = networkMode2 + ", " + networkMode3;
@@ -871,6 +904,9 @@
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
@@ -998,8 +1034,9 @@
const rawdata = data;
const lines = rawdata.split("\n");
console.log("CSQ: ", lines);
this.csq = lines[0].split(":")[1].split(",")[0].trim();
this.csq = lines[1].split(":")[1].split(",")[0].trim();
});
});
}
@@ -1031,11 +1068,22 @@
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)
: 5; // Change 5 to your desired default value
this.fetchNetworkInfo();
// sleep for 2 seconds
setTimeout(() => {
@@ -1044,7 +1092,8 @@
this.requestPing()
.then((data) => {
const response = data.trim(); // Trim any leading/trailing spaces
const response = data.trim();
// Trim any leading/trailing spaces
if (response === "OK") {
this.internetConnection = "Connected";
} else {
@@ -1069,7 +1118,8 @@
this.requestPing()
.then((data) => {
const response = data.trim(); // Trim any leading/trailing spaces
const response = data.trim();
// Trim any leading/trailing spaces
if (response === "OK") {
this.internetConnection = "Connected";
} else {
@@ -1082,7 +1132,6 @@
});
this.lastUpdate = new Date().toLocaleString();
console.log("Refreshed");
}, this.refreshRate * 1000);
},

View File

@@ -15,14 +15,16 @@ function parseCurrentSettings(rawdata) {
let bands = [];
// Append the values if there is separated by comma
// Append the values if there is separated by comma with a space.
// i.e. LTE BAND 3, LTE BAND 1
for (let i = 13; i < 17; i++) {
if (lines[i].split(",").length > 1) {
bands.push(lines[i].split(",")[3].replace(/\"/g, ""));
bands.push(lines[i].split(",")[3].replace(/\"/g, " "));
}
}
this.bands = bands;
if (this.cellLock4GStatus == 1 && this.cellLock5GStatus == 1) {
this.cellLockStatus = "Locked to 4G and 5G";

View File

@@ -43,7 +43,12 @@
<a class="nav-link" href="/">Home</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="network.html" aria-current="page">Simple Network</a>
<a
class="nav-link active"
href="network.html"
aria-current="page"
>Simple Network</a
>
</li>
<li class="nav-item">
<a class="nav-link" href="/settings.html">Simple Settings</a>
@@ -52,18 +57,16 @@
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="deviceinfo.html">Device Information</a>
<a class="nav-link" href="deviceinfo.html"
>Device Information</a
>
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>
@@ -552,7 +555,7 @@
updatedLockedBands: null,
sim: "-",
newSim: null,
cellLockStatus: null,
cellLockStatus: "Unknown",
bands: "Fetching Bands...",
init() {
// Function to populate checkboxes

View File

@@ -39,14 +39,16 @@
<a class="nav-link" href="/network.html">Simple Network</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="/settings.html" aria-current="page">Simple Settings</a>
<a
class="nav-link active"
href="/settings.html"
aria-current="page"
>Simple Settings</a
>
</li>
<li class="nav-item">
<a class="nav-link" href="/sms.html">SMS</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html"
>Device Information</a
@@ -54,11 +56,10 @@
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>

View File

@@ -50,11 +50,13 @@
<a class="nav-link" href="/settings.html">Simple Settings</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="/sms.html" aria-current="page">SMS</a>
<a
class="nav-link active"
href="/sms.html"
aria-current="page"
>SMS</a
>
</li>
<li class="nav-item">
<a class="nav-link" href="/console">Console</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/deviceinfo.html"
>Device Information</a
@@ -62,11 +64,10 @@
</li>
</ul>
<span class="navbar-text">
<button class="btn btn-link text-reset" id="darkModeToggle">Dark Mode</button>
<button class="btn btn-link text-reset" id="darkModeToggle">
Dark Mode
</button>
</span>
<span class="navbar-text">
<button class="btn btn-link" href="logout.html">Log Out</button>
</span>
</div>
</div>
</nav>