nodestatus-server 1.2.0-beta → 1.2.2-beta

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;
@@ -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 });
@@ -54928,13 +54950,16 @@ const delServer$1 = async (ctx) => {
   await handleRequest$1(ctx, delServer$2(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, setOrder(order.join(",")));
+};
+const queryEvents = async (ctx) => {
+  await handleRequest$1(ctx, readEvents());
 };
 
 const router = new router$1({ prefix: "/api" });
@@ -54945,6 +54970,7 @@ router.post("/server", addServer$1);
 router.put("/server", setServer$1);
 router.put("/server/order", modifyOrder);
 router.delete("/server/:username", delServer$1);
+router.get("/event", queryEvents);
 
 var bufferUtil$1 = {exports: {}};
 
@@ -61327,6 +61353,12 @@ async function getServer(username) {
 function getRawListServers() {
   return handleRequest(getListServers$1());
 }
+function createNewEvent(username) {
+  return handleRequest(createEvent(username));
+}
+function resolveEvent(username) {
+  return handleRequest(updateEvent(username, true));
+}
 
 function callHook(instance, hook, ...args) {
   try {
@@ -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);
         });
@@ -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")
@@ -62066,12 +62106,12 @@ ${str}`;
       const currentChat = ctx.message.chat.id.toString();
       if (chatId.has(currentChat)) {
         ctx.reply(`\u{1F34A}NodeStatus
-\u{1F916} Hi, this chat id is *${currentChat}*\\.
+\u{1F916} Hi, this chat id is *${parseEntities(currentChat)}*\\.
 You have access to this service\\. I will alert you when your servers changed\\.
 You are currently using NodeStatus: *${parseEntities(process.env.npm_package_version)}*`, { parse_mode: "MarkdownV2" });
       } else {
         ctx.reply(`\u{1F34A}NodeStatus
-\u{1F916} Hi, this chat id is *${currentChat}*\\.
+\u{1F916} Hi, this chat id is *${parseEntities(currentChat)}*\\.
 You *do not* have permission to use this service\\.
 Please check your settings\\.`, { parse_mode: "MarkdownV2" });
       }