mirror of
https://github.com/dec0dOS/zero-ui.git
synced 2024-09-20 06:56:05 +08:00
feat: last online
This commit is contained in:
parent
206d12ded3
commit
40f98cc9df
|
@ -23,11 +23,15 @@ app.use(express.urlencoded({ extended: false }));
|
|||
if (process.env.ZU_DISABLE_AUTH !== "true") {
|
||||
app.use(
|
||||
bearerToken({
|
||||
headerKey: "Bearer",
|
||||
headerKey: "token",
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === "production") {
|
||||
console.debug = function () {};
|
||||
}
|
||||
|
||||
if (
|
||||
process.env.NODE_ENV === "production" &&
|
||||
process.env.ZU_SECURE_HEADERS !== "false"
|
||||
|
@ -56,6 +60,18 @@ initAdmin().then(function (admin) {
|
|||
db.defaults({ users: [admin], networks: [] }).write();
|
||||
});
|
||||
|
||||
if (process.env.ZU_LAST_SEEN_FETCH !== "false") {
|
||||
let schedule = process.env.ZU_LAST_SEEN_SCHEDULE || "*/5 * * * *";
|
||||
cron.schedule(schedule, () => {
|
||||
console.debug("Running scheduled job");
|
||||
const networks = db.get("networks").value();
|
||||
networks.forEach((network) => {
|
||||
console.debug("Processing " + network.id);
|
||||
pingAll(network);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
const routerAPI = express.Router();
|
||||
const routerController = express.Router();
|
||||
|
||||
|
@ -76,13 +92,4 @@ app.use(async function (err, req, res) {
|
|||
res.status(500).json({ error: "500 Internal server error" });
|
||||
});
|
||||
|
||||
// ping all networks every 5 minutes
|
||||
cron.schedule('5 * * * *', () => {
|
||||
const networks = db.get('networks').value();
|
||||
networks.forEach((network) => {
|
||||
pingAll(network);
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
module.exports = app;
|
||||
|
|
|
@ -25,13 +25,14 @@ async function getMemberAdditionalData(data) {
|
|||
network.defaults({ members: [] }).get("members").write();
|
||||
// END MIGRATION SECTION
|
||||
|
||||
const additionalData = db
|
||||
const member = db
|
||||
.get("networks")
|
||||
.find({ id: data.nwid })
|
||||
.get("members")
|
||||
.find({ id: data.id })
|
||||
.get("additionalConfig")
|
||||
.value();
|
||||
.find({ id: data.id });
|
||||
|
||||
const additionalData = member.get("additionalConfig").value();
|
||||
const lastOnline = member.get("lastOnline").value() || 0;
|
||||
|
||||
const peer = await getPeer(data.id);
|
||||
let peerData = {};
|
||||
|
@ -57,11 +58,11 @@ async function getMemberAdditionalData(data) {
|
|||
|
||||
return {
|
||||
id: data.nwid + "-" + data.id,
|
||||
type: "Member",
|
||||
clock: Math.floor(new Date().getTime() / 1000),
|
||||
clock: new Date().getTime(),
|
||||
networkId: data.nwid,
|
||||
nodeId: data.id,
|
||||
controllerId: ZT_ADDRESS,
|
||||
lastOnline: lastOnline,
|
||||
...additionalData,
|
||||
...peerData,
|
||||
config: data,
|
||||
|
|
|
@ -23,8 +23,7 @@ async function getNetworkAdditionalData(data) {
|
|||
|
||||
return {
|
||||
id: data.id,
|
||||
type: "Network",
|
||||
clock: Math.floor(new Date().getTime() / 1000),
|
||||
clock: new Date().getTime(),
|
||||
...additionalData.value(),
|
||||
config: data,
|
||||
};
|
||||
|
|
|
@ -1,22 +1,29 @@
|
|||
const api = require("./controller-api");
|
||||
const db = require("./db");
|
||||
|
||||
export default pingAll;
|
||||
async function pingAll (network) {
|
||||
await Promise.all(network.members.map((async (member) => {
|
||||
try {
|
||||
await api.get("peer/" + member.id);
|
||||
// write lastOnelineTime field in db
|
||||
db.get("networks")
|
||||
.filter({ id: network.id })
|
||||
.map("members")
|
||||
.first()
|
||||
.filter({ id: member.id })
|
||||
.first()
|
||||
.set("lastOnlineTime", new Date().getTime())
|
||||
.write();
|
||||
} catch (err) {
|
||||
return;
|
||||
}
|
||||
})));
|
||||
};
|
||||
async function pingAll(network) {
|
||||
await Promise.all(
|
||||
network.members.map(async (member) => {
|
||||
console.debug("Processing " + member.id);
|
||||
api
|
||||
.get("peer/" + member.id)
|
||||
.then(async function () {
|
||||
// write lastOneline field in db
|
||||
db.get("networks")
|
||||
.filter({ id: network.id })
|
||||
.map("members")
|
||||
.first()
|
||||
.filter({ id: member.id })
|
||||
.first()
|
||||
.set("lastOnline", new Date().getTime())
|
||||
.write();
|
||||
})
|
||||
.catch(function (err) {
|
||||
console.debug("Couldn't fetch", member.id);
|
||||
return;
|
||||
});
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
module.exports = pingAll;
|
||||
|
|
|
@ -5,6 +5,8 @@ module.exports = async function () {
|
|||
const res = await api.get("status");
|
||||
return res.data.address;
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
console.error(
|
||||
"Couldn't connect to the controller on " + err.config.baseURL
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
"@uiw/react-codemirror": "^3.1.0",
|
||||
"axios": "^0.27.2",
|
||||
"codemirror": "^5.62.3",
|
||||
"date-fns": "^2.29.2",
|
||||
"history": "^5.3.0",
|
||||
"ipaddr.js": "^2.0.1",
|
||||
"lodash": "^4.17.21",
|
||||
|
|
|
@ -14,6 +14,7 @@ import DataTable from "react-data-table-component";
|
|||
import { useParams } from "react-router-dom";
|
||||
import API from "utils/API";
|
||||
import { parseValue, replaceValue, setValue } from "utils/ChangeHelper";
|
||||
import { formatDistance } from "date-fns";
|
||||
import AddMember from "./components/AddMember";
|
||||
import DeleteMember from "./components/DeleteMember";
|
||||
import ManagedIP from "./components/ManagedIP";
|
||||
|
@ -98,40 +99,40 @@ function NetworkMembers({ network }) {
|
|||
},
|
||||
{
|
||||
id: "status",
|
||||
name: "Peer status",
|
||||
name: "Last seen",
|
||||
minWidth: "100px",
|
||||
cell: (row) =>
|
||||
row.online === 0 ? (
|
||||
<Typography color="error">OFFLINE</Typography>
|
||||
) : row.online === 1 ? (
|
||||
<Typography style={{ color: "#008000" }}>
|
||||
{"ONLINE (v" +
|
||||
row.config.vMajor +
|
||||
"." +
|
||||
row.config.vMinor +
|
||||
"." +
|
||||
row.config.vRev +
|
||||
")"}
|
||||
row.online === 1 ? (
|
||||
<Typography style={{ color: "#008000" }}>{"ONLINE"}</Typography>
|
||||
) : row.controllerId === row.config.address ? (
|
||||
<Typography style={{ color: "#c5e31e" }}>{"CONTROLLER"}</Typography>
|
||||
) : row.online === 0 ? (
|
||||
<Typography color="error">
|
||||
{row.lastOnline !== 0
|
||||
? formatDistance(row.lastOnline, row.clock, {
|
||||
includeSeconds: false,
|
||||
addSuffix: true,
|
||||
})
|
||||
: "OFFLINE"}
|
||||
</Typography>
|
||||
) : (
|
||||
<Typography style={{ color: "#f1c232" }}>
|
||||
{"RELAYED (v" +
|
||||
row.config.vMajor +
|
||||
"." +
|
||||
row.config.vMinor +
|
||||
"." +
|
||||
row.config.vRev +
|
||||
")"}
|
||||
</Typography>
|
||||
<Typography style={{ color: "#f1c232" }}>{"RELAYED"}</Typography>
|
||||
),
|
||||
},
|
||||
{
|
||||
id: "physicalip",
|
||||
name: "Physical IP / Latency",
|
||||
name: "Version / Physical IP / Latency",
|
||||
minWidth: "220px",
|
||||
cell: (row) =>
|
||||
row.online === 1 ? (
|
||||
<p>
|
||||
{"v" +
|
||||
row.config.vMajor +
|
||||
"." +
|
||||
row.config.vMinor +
|
||||
"." +
|
||||
row.config.vRev}
|
||||
<br />
|
||||
{row.physicalAddress + "/" + row.physicalPort}
|
||||
<br />
|
||||
{"(" + row.latency + " ms)"}
|
||||
|
@ -181,7 +182,7 @@ function NetworkMembers({ network }) {
|
|||
spacing={0}
|
||||
direction="column"
|
||||
alignItems="center"
|
||||
justify="center"
|
||||
justifyContent="center"
|
||||
style={{
|
||||
minHeight: "50vh",
|
||||
}}
|
||||
|
|
|
@ -69,8 +69,8 @@ function NetworkSettings({ network, setNetwork }) {
|
|||
value={network["description"]}
|
||||
onChange={handleChange("description")}
|
||||
multiline
|
||||
rows={2}
|
||||
rowsMax={Infinity}
|
||||
minRows={2}
|
||||
maxRows={Infinity}
|
||||
label="Description"
|
||||
variant="filled"
|
||||
InputLabelProps={{
|
||||
|
|
|
@ -10,6 +10,6 @@ export default axios.create({
|
|||
localStorage.getItem("disableAuth") === "true"
|
||||
? {}
|
||||
: {
|
||||
Authorization: `Bearer ${JSON.parse(localStorage.getItem("token"))}`,
|
||||
Authorization: `token ${JSON.parse(localStorage.getItem("token"))}`,
|
||||
},
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue