[push type] hide upside down mode, apply primary base url

This commit is contained in:
LouisLam
2021-10-08 20:03:52 +08:00
parent 3f26327f95
commit fc8d1e78b6
5 changed files with 28 additions and 14 deletions

View File

@@ -1,6 +1,5 @@
const { setSetting } = require("./util-server");
const axios = require("axios");
const { isDev } = require("../src/util");
exports.version = require("../package.json").version;
exports.latestVersion = null;

View File

@@ -4,6 +4,8 @@
const { TimeLogger } = require("../src/util");
const { R } = require("redbean-node");
const { io } = require("./server");
const { setting } = require("./util-server");
const checkVersion = require("./check-version");
async function sendNotificationList(socket) {
const timeLogger = new TimeLogger();
@@ -14,10 +16,10 @@ async function sendNotificationList(socket) {
]);
for (let bean of list) {
result.push(bean.export())
result.push(bean.export());
}
io.to(socket.userID).emit("notificationList", result)
io.to(socket.userID).emit("notificationList", result);
timeLogger.print("Send Notification List");
@@ -39,7 +41,7 @@ async function sendHeartbeatList(socket, monitorID, toUser = false, overwrite =
LIMIT 100
`, [
monitorID,
])
]);
let result = list.reverse();
@@ -69,7 +71,7 @@ async function sendImportantHeartbeatList(socket, monitorID, toUser = false, ove
LIMIT 500
`, [
monitorID,
])
]);
timeLogger.print(`[Monitor: ${monitorID}] sendImportantHeartbeatList`);
@@ -81,8 +83,18 @@ async function sendImportantHeartbeatList(socket, monitorID, toUser = false, ove
}
async function sendInfo(socket) {
socket.emit("info", {
version: checkVersion.version,
latestVersion: checkVersion.latestVersion,
primaryBaseURL: await setting("primaryBaseURL")
});
}
module.exports = {
sendNotificationList,
sendImportantHeartbeatList,
sendHeartbeatList,
}
sendInfo
};

View File

@@ -90,7 +90,7 @@ const io = new Server(server);
module.exports.io = io;
// Must be after io instantiation
const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList } = require("./client");
const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList, sendInfo } = require("./client");
const { statusPageSocketHandler } = require("./socket-handlers/status-page-socket-handler");
app.use(express.json());
@@ -180,10 +180,7 @@ exports.entryPage = "dashboard";
console.log("Adding socket handler");
io.on("connection", async (socket) => {
socket.emit("info", {
version: checkVersion.version,
latestVersion: checkVersion.latestVersion,
});
sendInfo(socket);
totalClient++;
@@ -870,6 +867,8 @@ exports.entryPage = "dashboard";
msg: "Saved"
});
sendInfo(socket);
} catch (e) {
callback({
ok: false,