nodestatus-server 1.2.0-beta.1 → 1.2.2-beta.1

package/build/app.js

@@ -53260,11 +53260,15 @@ exports.Option = Option;
 }(commander, commander.exports));
 
 dotenv__default["default"].config({ path: require$$1$1.resolve(require$$1$3.homedir(), ".nodestatus/.env.local") });
-commander.exports.program.option("-db, --database <db>", "the path of database", require$$1$3.platform() === "win32" ? require$$1$1.resolve(require$$1$3.homedir(), ".nodestatus/db.sqlite") : "/usr/local/NodeStatus/server/db.sqlite").option("-p, --port <port>", "the port of NodeStatus", "35601").option("-i, --interval <interval>", "update interval", "1500").parse(process.argv);
+commander.exports.program.option("-db, --database <db>", "the path of database", require$$1$3.platform() === "win32" ? `file:${require$$1$1.resolve(require$$1$3.homedir(), ".nodestatus/db.sqlite")}` : "file:/usr/local/NodeStatus/server/db.sqlite").option("-p, --port <port>", "the port of NodeStatus", "35601").option("-i, --interval <interval>", "update interval", "1500").parse(process.argv);
 const options = commander.exports.program.opts();
+let database = process.env.DATABASE || (process.env.NODE_ENV === "TEST" ? require$$1$1.resolve(__dirname, "../../db.base.sqlite") : options.database);
+if (!(database.includes("file:") || database.includes("mysql:") || database.includes("postgresql:"))) {
+  database = `file:${database}`;
+}
 const config = {
   NODE_ENV: process.env.NODE_ENV,
-  database: process.env.DATABASE || (process.env.NODE_ENV === "TEST" ? require$$1$1.resolve(__dirname, "../../db.base.sqlite") : options.database),
+  database,
   port: Number(process.env.PORT || options.port),
   interval: Number(process.env.INTERVAL || options.interval),
   verbose: process.env.VERBOSE === "true",
@@ -54750,11 +54754,11 @@ var bcryptjs = bcrypt.exports;
 const prisma = new client.PrismaClient({
   datasources: {
     db: {
-      url: `file:${config.database}`
+      url: `${config.database}`
     }
   }
 });
-const actions = new Set(["create", "createMany", "update", "updateMany", "upsert"]);
+const actions = /* @__PURE__ */ new Set(["create", "createMany", "update", "updateMany", "upsert"]);
 const parseFields = async (server) => {
   for (const key in server) {
     if (server[key] === "") {
@@ -54778,7 +54782,7 @@ prisma.$use(async (params, next) => {
 });
 
 let isInitial = true;
-const orderMap = new Map();
+const orderMap = /* @__PURE__ */ new Map();
 const resolveResult = (item) => {
   if (!item)
     return item;
@@ -54786,7 +54790,7 @@ const resolveResult = (item) => {
     delete item[key];
   return Object.assign(item, { order: orderMap.get(item.id) || item.id || 0 });
 };
-const updateOrder = (order, shouldEmit = true) => {
+const updateCacheOrder = (order, shouldEmit = true) => {
   orderMap.clear();
   const orderList = order === "" ? [] : order.split(",");
   for (let i = 0; i < orderList.length; ++i) {
@@ -54801,18 +54805,18 @@ const queryOrder = async () => {
     }
   });
   isInitial = false;
-  return updateOrder(order?.value || "");
+  return updateCacheOrder(order?.value || "");
 };
-async function setOrder(order, Prisma = prisma) {
+async function updateOrder(order, Prisma = prisma) {
   const shouldEmit = Prisma === prisma;
   await Prisma.option.upsert({
     where: { name: "order" },
     update: { value: order },
     create: { name: "order", value: order }
   });
-  updateOrder(order, shouldEmit);
+  updateCacheOrder(order, shouldEmit);
 }
-async function getServer$1(username) {
+async function readServer(username) {
   const item = await prisma.server.findUnique({
     where: {
       username
@@ -54820,7 +54824,7 @@ async function getServer$1(username) {
   });
   return resolveResult(item);
 }
-async function getServerPassword(username) {
+async function readServerPassword(username) {
   const item = await prisma.server.findUnique({
     where: {
       username
@@ -54828,7 +54832,7 @@ async function getServerPassword(username) {
   });
   return item?.password || null;
 }
-async function getListServers$1() {
+async function readServersList() {
   const queries = [prisma.server.findMany()];
   isInitial && queries.push(queryOrder());
   const [items] = await Promise.all(queries);
@@ -54839,7 +54843,7 @@ async function createServer(item) {
     const server = await prisma2.server.create({ data: item });
     const order = Array.from(orderMap.keys());
     order.push(server.id);
-    await setOrder(order.join(","), prisma2);
+    await updateOrder(order.join(","), prisma2);
   });
   emitter.emit("update", item.username);
 }
@@ -54848,11 +54852,11 @@ async function bulkCreateServer(items) {
     const order = [];
     await Promise.all(items.map((item) => prisma2.server.create({ data: item }).then((server) => order.push(server.id))));
     const newOrder = Array.from(orderMap.keys()).concat(order);
-    await setOrder(newOrder.join(","), prisma2);
+    await updateOrder(newOrder.join(","), prisma2);
   });
   emitter.emit("update");
 }
-async function delServer$2(username) {
+async function deleteServer(username) {
   await prisma.$transaction(async (prisma2) => {
     const server = await prisma2.server.delete({
       where: {
@@ -54860,11 +54864,11 @@ async function delServer$2(username) {
       }
     });
     orderMap.delete(server.id);
-    await setOrder(Array.from(orderMap.keys()).join(","), prisma2);
+    await updateOrder(Array.from(orderMap.keys()).join(","), prisma2);
   });
   emitter.emit("update", username, true);
 }
-async function setServer$2(username, obj) {
+async function updateServer(username, obj) {
   await prisma.server.update({
     where: {
       username
@@ -54876,6 +54880,24 @@ async function setServer$2(username, obj) {
   obj.username && emitter.emit("update", obj.username, true);
 }
 
+const createEvent = (username) => prisma.event.create({
+  data: {
+    username
+  }
+});
+const updateEvent = (username, resolved = true) => prisma.event.updateMany({
+  where: {
+    AND: [
+      { username },
+      { resolved: false }
+    ]
+  },
+  data: {
+    resolved
+  }
+});
+const readEvents = () => prisma.event.findMany({});
+
 async function handleRequest$1(ctx, handler) {
   try {
     ctx.body = createRes({ data: await handler });
@@ -54884,8 +54906,8 @@ async function handleRequest$1(ctx, handler) {
     ctx.body = createRes(1, err.message);
   }
 }
-const listServers = async (ctx) => {
-  await handleRequest$1(ctx, getListServers$1().then((data) => data.sort((x, y) => y.order - x.order)));
+const getListServers$1 = async (ctx) => {
+  await handleRequest$1(ctx, readServersList().then((data) => data.sort((x, y) => y.order - x.order)));
 };
 const setServer$1 = async (ctx) => {
   const { username } = ctx.request.body;
@@ -54897,7 +54919,7 @@ const setServer$1 = async (ctx) => {
   }
   if (username === data.username)
     delete data.username;
-  await handleRequest$1(ctx, setServer$2(username, data));
+  await handleRequest$1(ctx, updateServer(username, data));
 };
 const addServer$1 = async (ctx) => {
   const data = ctx.request.body;
@@ -54918,33 +54940,37 @@ const addServer$1 = async (ctx) => {
     await handleRequest$1(ctx, createServer(data));
   }
 };
-const delServer$1 = async (ctx) => {
+const removeServer$1 = async (ctx) => {
   const { username = "" } = ctx.params;
   if (!username) {
     ctx.status = 400;
     ctx.body = createRes(1, "Wrong request");
     return;
   }
-  await handleRequest$1(ctx, delServer$2(username));
+  await handleRequest$1(ctx, deleteServer(username));
 };
 const modifyOrder = async (ctx) => {
-  const { order = "" } = ctx.request.body;
-  if (!order) {
+  const { order = [] } = ctx.request.body;
+  if (!order.length) {
     ctx.status = 400;
     ctx.body = createRes(1, "Wrong request");
     return;
   }
-  await handleRequest$1(ctx, setOrder(order));
+  await handleRequest$1(ctx, updateOrder(order.join(",")));
+};
+const queryEvents = async (ctx) => {
+  await handleRequest$1(ctx, readEvents());
 };
 
 const router = new router$1({ prefix: "/api" });
 router.get("/session", verifySession);
 router.post("/session", createSession);
-router.get("/server", listServers);
+router.get("/server", getListServers$1);
 router.post("/server", addServer$1);
 router.put("/server", setServer$1);
 router.put("/server/order", modifyOrder);
-router.delete("/server/:username", delServer$1);
+router.delete("/server/:username", removeServer$1);
+router.get("/event", queryEvents);
 
 var bufferUtil$1 = {exports: {}};
 
@@ -61287,7 +61313,7 @@ async function handleRequest(handler) {
   return createRes({ data });
 }
 async function authServer(username, password) {
-  const res = await handleRequest(getServerPassword(username));
+  const res = await handleRequest(readServerPassword(username));
   if (res.code || !res.data)
     return false;
   return bcryptjs.compare(password, res.data);
@@ -61296,13 +61322,13 @@ function addServer(obj) {
   return handleRequest(createServer(obj));
 }
 function setServer(username, obj) {
-  return handleRequest(setServer$2(username, obj));
+  return handleRequest(updateServer(username, obj));
 }
-function delServer(username) {
-  return handleRequest(delServer$2(username));
+function removeServer(username) {
+  return handleRequest(deleteServer(username));
 }
 async function getListServers() {
-  const result = await handleRequest(getListServers$1());
+  const result = await handleRequest(readServersList());
   if (result.code)
     return result;
   const obj = {};
@@ -61315,7 +61341,7 @@ async function getListServers() {
   return createRes({ data: obj });
 }
 async function getServer(username) {
-  const result = await handleRequest(getServer$1(username));
+  const result = await handleRequest(readServer(username));
   if (result.code || !result.data)
     return result;
   const { data } = result;
@@ -61325,7 +61351,13 @@ async function getServer(username) {
   return createRes({ data: item });
 }
 function getRawListServers() {
-  return handleRequest(getListServers$1());
+  return handleRequest(readServersList());
+}
+function createNewEvent(username) {
+  return handleRequest(createEvent(username));
+}
+function resolveEvent(username) {
+  return handleRequest(updateEvent(username, true));
 }
 
 function callHook(instance, hook, ...args) {
@@ -61338,14 +61370,20 @@ function callHook(instance, hook, ...args) {
   }
 }
 class NodeStatus {
+  options;
+  server;
+  ioPub = new ws.Server({ noServer: true });
+  ioConn = new ws.Server({ noServer: true });
+  ipMap = new WeakMap();
+  userMap = /* @__PURE__ */ new Map();
+  isBanned = /* @__PURE__ */ new Map();
+  servers = {};
+  serversPub = [];
+  onServerConnect;
+  onServerBanned;
+  onServerConnected;
+  onServerDisconnected;
   constructor(server, options) {
-    this.ioPub = new ws.Server({ noServer: true });
-    this.ioConn = new ws.Server({ noServer: true });
-    this.ipMap = new WeakMap();
-    this.userMap = new Map();
-    this.isBanned = new Map();
-    this.servers = {};
-    this.serversPub = [];
     this.server = server;
     this.options = options;
     emitter.on("update", this.updateStatus.bind(this));
@@ -61417,12 +61455,14 @@ class NodeStatus {
         }
         socket.send(`You are connecting via: ${ipType}`);
         logger.info(`${address} has connected to server`);
+        resolveEvent(username).then();
         socket.on("message", (buf2) => this.servers[username].status = decode(buf2));
         this.userMap.set(username, socket);
         callHook(this, "onServerConnected", socket, username);
         socket.once("close", () => {
           this.userMap.delete(username);
           this.servers[username] && (this.servers[username].status = {});
+          createNewEvent(username).then();
           logger.warn(`${address} disconnected`);
           callHook(this, "onServerDisconnected", socket, username);
         });
@@ -61501,7 +61541,7 @@ function createIpc() {
             break;
           }
           case "del": {
-            const status = await delServer(payload);
+            const status = await removeServer(payload);
             client.write(JSON.stringify(status));
             break;
           }
@@ -62000,8 +62040,8 @@ var dist = createHttpsProxyAgent;
 
 function createPush(options) {
   const pushList = [];
-  const timerMap = new Map();
-  const entities = new Set(["_", "*", "[", "]", "(", ")", "~", "`", ">", "#", "+", "-", "=", "|", "{", "}", ".", "!", "\\"]);
+  const timerMap = /* @__PURE__ */ new Map();
+  const entities = /* @__PURE__ */ new Set(["_", "*", "[", "]", "(", ")", "~", "`", ">", "#", "+", "-", "=", "|", "{", "}", ".", "!", "\\"]);
   const parseEntities = (msg) => {
     let str;
     if (typeof msg !== "string")
@@ -62037,15 +62077,15 @@ function createPush(options) {
         str += "\n\n";
         return;
       }
-      str += `\u5F53\u524D\u8D1F\u8F7D: ${parseEntities(item.status.load.toFixed(2))} 
+      str += `\u8D1F\u8F7D: ${parseEntities(item.status.load.toFixed(2))} 
 `;
-      str += `\u5F53\u524DCPU\u5360\u7528: ${Math.round(item.status.cpu)}% 
+      str += `CPU: ${Math.round(item.status.cpu)}% 
 `;
-      str += `\u5F53\u524D\u5185\u5B58\u5360\u7528: ${Math.round(item.status.memory_used / item.status.memory_total * 100)}% 
+      str += `\u5185\u5B58: ${Math.round(item.status.memory_used / item.status.memory_total * 100)}% 
 `;
-      str += `\u5F53\u524D\u786C\u76D8\u5360\u7528: ${Math.round(item.status.hdd_used / item.status.hdd_total * 100)}% 
+      str += `\u786C\u76D8: ${Math.round(item.status.hdd_used / item.status.hdd_total * 100)}% 
 `;
-      str += "\n\n";
+      str += "\n";
     });
     return `\u{1F34A}*NodeStatus* 
 \u{1F916} \u5F53\u524D\u6709 ${this.serversPub.length} \u53F0\u670D\u52A1\u5668, \u5176\u4E2D\u5728\u7EBF ${online} \u53F0