nodestatus-server 1.1.0-alpha.3 → 1.1.0-alpha.4

package/build/app.js

@@ -60283,6 +60283,7 @@ const config = {
     webPassword: process.env.WEB_PASSWORD || '',
     webSecret: process.env.WEB_SECRET || process.env.WEB_PASSWORD || 'secret',
     ipcAddress: process.env.IPC_ADDRESS || (require$$1$1.platform() !== 'win32' ? '/tmp/status_unix.sock' : '\\\\.\\pipe\\status_ipc'),
+    pushTimeOut: Number(process.env.PUSH_TIMEOUT) || 30,
     telegram: {
         proxy: process.env.TGBOT_PROXY,
         bot_token: process.env.TGBOT_TOKEN || '',
@@ -69035,10 +69036,7 @@ class NodeStatus {
         this.isBanned.set(address, true);
         logger.warn(`${address} was banned ${t} seconds, reason: ${reason}`);
         callHook(this, 'onServerBanned', address, reason);
-        const id = setTimeout(() => {
-            this.isBanned.delete(address);
-            clearTimeout(id);
-        }, t * 1000);
+        setTimeout(() => this.isBanned.delete(address), t * 1000);
     }
     launch() {
         this.server.on('upgrade', (request, socket, head) => {
@@ -69160,6 +69158,8 @@ class NodeStatus {
     /* This should move to another file later */
     createPush() {
         const pushList = [];
+        /* ip -> timer */
+        const timerMap = new Map();
         const entities = new Set(['_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!', '\\']);
         const parseEntities = (str) => {
             if (typeof str !== 'string')
@@ -69245,8 +69245,27 @@ class NodeStatus {
             }
             pushList.push(message => [...chatId].map(id => bot.telegram.sendMessage(id, `${message}`, { parse_mode: 'MarkdownV2' })));
         }
-        this.onServerConnected = (socket, username) => Promise.all(pushList.map(fn => fn(`🍊*NodeStatus* \n😀 One new server has connected\\! \n\n *用户名*: ${parseEntities(username)} \n *节点名*: ${parseEntities(this.servers[username]['name'])} \n *时间*: ${parseEntities(new Date())}`)));
-        this.onServerDisconnected = (socket, username) => Promise.all(pushList.map(fn => fn(`🍊*NodeStatus* \n😰 One server has disconnected\\! \n\n *用户名*: ${parseEntities(username)} \n *节点名*: ${parseEntities(this.servers[username]?.['name'])} \n *时间*: ${parseEntities(new Date())}`)));
+        this.onServerConnected = (socket, username) => {
+            const ip = this.map.get(socket);
+            if (ip) {
+                const timer = timerMap.get(ip);
+                if (timer) {
+                    clearTimeout(timer);
+                    timerMap.delete(ip);
+                }
+                else {
+                    return Promise.all(pushList.map(fn => fn(`🍊*NodeStatus* \n😀 One new server has connected\\! \n\n *用户名*: ${parseEntities(username)} \n *节点名*: ${parseEntities(this.servers[username]['name'])} \n *时间*: ${parseEntities(new Date())}`)));
+                }
+            }
+        };
+        this.onServerDisconnected = (socket, username) => {
+            const ip = this.map.get(socket);
+            const timer = setTimeout(() => {
+                Promise.all(pushList.map(fn => fn(`🍊*NodeStatus* \n😰 One server has disconnected\\! \n\n *用户名*: ${parseEntities(username)} \n *节点名*: ${parseEntities(this.servers[username]?.['name'])} \n *时间*: ${parseEntities(new Date())}`))).then();
+                ip && timerMap.delete(ip);
+            }, this.options.pushTimeOut * 1000);
+            ip && timerMap.set(ip, timer);
+        };
     }
 }
 
@@ -69256,6 +69275,7 @@ async function createStatus(app) {
     const instance = new NodeStatus(server, {
         interval: Number(config.interval),
         usePush: config.usePush,
+        pushTimeOut: config.pushTimeOut,
         telegram: {
             ...config.telegram,
             chat_id: config.telegram.chat_id.split(',')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodestatus-server",
-  "version": "1.1.0-alpha.3",
+  "version": "1.1.0-alpha.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/cokemine/nodestatus.git",