koishi-plugin-node-async-bot-all 2.22.1 → 2.23.0

package/lib/commands.d.ts

@@ -44,13 +44,32 @@ interface NewsItem {
     feed_type: number;
     appid: number;
 }
+interface Heartbeat {
+    status: 0 | 1;
+    time: string;
+    msg: string;
+    ping: number | null;
+}
+interface HeartbeatList {
+    [monitorId: string]: Heartbeat[];
+}
+interface UptimeList {
+    [periodKey: string]: number;
+}
+export interface MonitorStatusResponse {
+    heartbeatList: HeartbeatList;
+    uptimeList: UptimeList;
+}
 export declare function getServer(ctx: Context, session: Session): Promise<Object>;
 export declare function getStatus(ctx: Context, session: Session): Promise<Object>;
 export declare function getRandom(ctx: Context, session: Session, min: number, max: number): Promise<Object>;
 export declare function getInfo(ctx: Context, session: Session): Promise<Object>;
 export declare function getRandomWord(ctx: Context, session: Session): Promise<Object>;
 export declare function getBlueArchive(ctx: Context, session: Session): Promise<Number>;
-export declare function serverTest(ctx: Context, session: Session): Promise<Object>;
+export declare function centerServerTest(ctx: Context, session: Session): Promise<{
+    success: string;
+    data: object;
+}>;
 export declare function getMeme(ctx: Context, session: Session, count: number): Promise<Number>;
 export declare function getCat(ctx: Context, session: Session): Promise<Number>;
 export declare function getQQInfo(ctx: Context, session: Session, qq: string): Promise<number>;

package/lib/fun.d.ts

@@ -1,6 +1,14 @@
-import { HttpResponse } from "./index";
 import { Context } from "koishi";
 import { APINews, APIUserInfo } from "./commands";
+export type HttpResponse<T> = {
+    success: true;
+    data: T;
+} | {
+    success: false;
+    error: any;
+    code?: number;
+    isJson: boolean;
+};
 export type serverInfo = {
     players: string;
     protocol: number;
@@ -12,18 +20,19 @@ export type serverInfo = {
     success: false;
     error: any;
 };
-export declare function getSystemUsage(): Promise<Object>;
+export declare function getSystemUsage(): Promise<{
+    name: string;
+    cpu: string;
+    memory: string;
+    success: 0;
+} | {
+    data: string;
+    success: 1;
+}>;
 export declare function getHongKongTime(): string;
 export declare function readInfoFile(ctx: Context): Promise<string>;
 export declare function formatTimestampDiff(start: number, end: number): string;
 export declare function getMsgCount(ctx: Context): Promise<Object>;
-export declare function hostPing(host: string): Promise<{
-    success: boolean;
-    data?: any;
-    ip?: string;
-    alive?: boolean;
-    packetLoss?: string;
-}>;
 export declare function random(type: number | undefined, data: any, data2?: any): number;
 export declare function request<T = any>(url: string, options?: RequestInit, timeout?: number, log?: any): Promise<HttpResponse<T>>;
 export declare function readUserCardFile(userInfo: APIUserInfo): Promise<string>;

package/lib/index.d.ts

@@ -1,14 +1,5 @@
 import { Context, Dict, Schema } from 'koishi';
 export declare const inject: string[];
-export type HttpResponse<T> = {
-    success: true;
-    data: T;
-} | {
-    success: false;
-    error: any;
-    code?: number;
-    isJson: boolean;
-};
 declare module 'koishi' {
     interface Tables {
         botData: botDataTables;
@@ -27,17 +18,21 @@ export interface ConfigCxV3 {
     id: string;
     server: Array<ConfigV3Server>;
 }
-export interface ConfigV3Server {
+interface ConfigV3Server {
     api: string;
     note: string;
     type: "mc" | "a2s" | null | undefined;
 }
+interface CenterServerConfig {
+    id: string;
+    name: string;
+}
 export interface Config {
     cxV3: Array<ConfigCxV3>;
     rwAPI: string;
     timeout: number;
     baAPI: string[];
-    serverPing: Dict<string>;
+    slTest: CenterServerConfig[];
     steamAPI: string;
     memesAPI: Dict<string>;
     catAPI: string;

package/lib/index.js

@@ -34,7 +34,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", listA2S: "【A2S 服务器 {count}】\n➣ {version}：{players}\n➣ 机器人：{bots}\n➣ 备注：{note}", listFailedA2S: "【A2S 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。", failed: "{quote}{time}\n获取失败：{data}" } }, getqqinfo: { description: "获取 QQ 号的信息。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } } } };
+    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", listA2S: "【A2S 服务器 {count}】\n➣ {version}：{players}\n➣ 机器人：{bots}\n➣ 备注：{note}", listFailedA2S: "【A2S 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, centerservertest: { description: "查看中心服务器状态。", messages: { msg: "{time}{list}", list: "== {name} ==\n状态：{status}\n存活率：{uptime}\n检测时间：{time}", listFailed: "== {name} ==\n查看失败：{data}", failed: "{time}\n查看失败：{data}" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。", failed: "{quote}{time}\n获取失败：{data}" } }, getqqinfo: { description: "获取 QQ 号的信息。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } }, slnews: { description: "抓取 NorthWood 的 Steam 最新新闻。" } } };
   }
 });
 
@@ -56,10 +56,9 @@ var import_koishi2 = require("koishi");
 // src/fun.ts
 var import_os = __toESM(require("os"));
 var import_fs = __toESM(require("fs"));
-var import_ping = __toESM(require("ping"));
-var import_steam_server_query = require("steam-server-query");
 var import_path = __toESM(require("path"));
 var import_koishi = require("koishi");
+var import_steam_server_query = require("steam-server-query");
 var import_html = __toESM(require("@bbob/html"));
 var import_preset_html5 = __toESM(require("@bbob/preset-html5"));
 function getSystemName() {
@@ -96,21 +95,19 @@ async function getCpuUsage() {
 }
 __name(getCpuUsage, "getCpuUsage");
 async function getSystemUsage() {
-  let info;
   try {
-    info = {
+    return {
       "name": getSystemName(),
       "cpu": await getCpuUsage() + "%",
       "memory": getMemoryUsage() + "%",
       "success": 0
     };
   } catch (error) {
-    info = {
+    return {
       "data": error.message,
       "success": 1
     };
   }
-  return info;
 }
 __name(getSystemUsage, "getSystemUsage");
 function getHongKongTime() {
@@ -161,7 +158,6 @@ function formatTimestampDiff(start, end) {
 __name(formatTimestampDiff, "formatTimestampDiff");
 async function getMsgCount(ctx) {
   const array = await ctx.database.get("analytics.message", { date: import_koishi.Time.getDateNumber() - 1 }, ["type", "count"]);
-  ctx.logger.info(import_koishi.Time.getDateNumber() - 1);
   let receive = 0;
   let send = 0;
   array.forEach((item) => {
@@ -174,25 +170,6 @@ async function getMsgCount(ctx) {
   return { "receive": receive, "send": send };
 }
 __name(getMsgCount, "getMsgCount");
-async function hostPing(host) {
-  try {
-    const tmp = await import_ping.default.promise.probe(host, {
-      timeout: 5
-    });
-    return {
-      "success": true,
-      "ip": tmp.numeric_host,
-      "alive": tmp.alive,
-      "packetLoss": tmp.packetLoss.toString()
-    };
-  } catch (error) {
-    return {
-      "success": false,
-      "data": error.message
-    };
-  }
-}
-__name(hostPing, "hostPing");
 function random(type = 0, data, data2) {
   const random2 = new import_koishi.Random(() => Math.random());
   switch (type) {
@@ -589,43 +566,66 @@ async function getBlueArchive(ctx, session) {
   return 0;
 }
 __name(getBlueArchive, "getBlueArchive");
-async function serverTest(ctx, session) {
-  const log = ctx.logger("serverTest");
+async function centerServerTest(ctx, session) {
+  const log = ctx.logger("centerServerTest");
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   const time = getHongKongTime();
-  const host = ctx.config.serverPing[`${session.event.guild?.id}`];
-  if (host == void 0) {
-    return {
-      "success": 1,
-      "time": time
-    };
-  }
-  const tmp = await hostPing(host);
-  log.info(tmp);
-  if (!tmp.success) {
-    return {
-      "success": 2,
-      "time": time,
-      "data": tmp.data
+  let msg;
+  let list = "";
+  const timeFormatter = new Intl.DateTimeFormat("zh-CN", {
+    timeZone: "Asia/Shanghai",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false
+  });
+  const response = await request("https://status.scpslgame.com/api/status-page/heartbeat/nw", {}, ctx.config.timeout, log);
+  if (response.success) {
+    for (const server of ctx.config.slTest) {
+      const lastTime = response.data.heartbeatList[server.id].at(-1);
+      if (lastTime) {
+        const uptime24 = (response.data.uptimeList[server.id + "_24"] * 100).toFixed(2) + "%";
+        const status = lastTime?.status == 1 ? "正常" : "故障";
+        const testTime = timeFormatter.format(/* @__PURE__ */ new Date(lastTime?.time.replace(" ", "T") + "Z"));
+        list = list + "\n" + session.text(".list", {
+          "name": server.name,
+          "status": status,
+          "uptime": uptime24,
+          "time": testTime
+        });
+      } else {
+        list = list + "\n" + session.text(".listFailed", {
+          "name": server.name,
+          "data": "未能获取到此服务器的状态信息。"
+        });
+      }
+    }
+    msg = {
+      "data": { "list": list, "time": time },
+      "success": ".msg"
     };
-  }
-  if (tmp.ip == void 0) {
-    return {
-      "success": 2,
-      "time": time,
-      "data": "未知的主机 " + host
+    log.debug("Sent:");
+    log.debug(msg);
+  } else {
+    let err;
+    if (response.code) {
+      err = response.isJson ? response.error["data"] : response.error;
+    } else {
+      err = response.error.message;
+    }
+    msg = {
+      "data": { "data": err, "time": time },
+      "success": ".failed"
     };
+    log.warn("Sent:");
+    log.warn(msg);
   }
-  return {
-    "success": 0,
-    "time": time,
-    "host": host,
-    "ip": tmp.ip,
-    "alive": tmp.alive == true ? "正常" : "异常",
-    "packetLoss": tmp.packetLoss
-  };
+  return msg;
 }
-__name(serverTest, "serverTest");
+__name(centerServerTest, "centerServerTest");
 async function getMeme(ctx, session, count) {
   const log = ctx.logger("getMeme");
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
@@ -814,7 +814,7 @@ async function getMsg(ctx, session) {
 __name(getMsg, "getMsg");
 async function getNewsMsg(ctx, type) {
   const log = ctx.logger("getNewsMsg");
-  const response = await request("http://127.0.0.1:8080/tasa/index.old/v.json", {}, ctx.config.timeout, log);
+  const response = await request("https://api.steampowered.com/ISteamNews/GetNewsForApp/v2/?appid=700330&count=1", {}, ctx.config.timeout, log);
   if (response.success) {
     if ((await ctx.database.get("botData", "newsId"))[0]?.data == response.data.appnews.newsitems[0].gid && type != 1) {
       log.debug("无新闻");
@@ -857,7 +857,7 @@ async function getNewsMsg(ctx, type) {
 __name(getNewsMsg, "getNewsMsg");
 
 // package.json
-var version = "2.22.1";
+var version = "2.23.0";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -887,9 +887,6 @@ var Config = import_koishi3.Schema.intersect([
   import_koishi3.Schema.object({
     baAPI: import_koishi3.Schema.array(String).default(["https://rba.kanostar.top/portrait"]).description("随机BA图 API")
   }).description("随机BA图"),
-  import_koishi3.Schema.object({
-    serverPing: import_koishi3.Schema.dict(String).role("table").description("键：群号；值：Host")
-  }).description("服之测测（Ping）"),
   import_koishi3.Schema.object({
     steamAPI: import_koishi3.Schema.string().default("https://api.tasaed.top/get/steamid/").description("转换 Steam ID API")
   }).description("转换 Steam ID"),
@@ -904,7 +901,13 @@ var Config = import_koishi3.Schema.intersect([
   }).description("获取 QQ 信息"),
   import_koishi3.Schema.object({
     slNews: import_koishi3.Schema.array(String).default([""]).description("{platform}:{channelId}")
-  }).description("SL新闻列表")
+  }).description("SL新闻列表"),
+  import_koishi3.Schema.object({
+    slTest: import_koishi3.Schema.array(import_koishi3.Schema.object({
+      id: import_koishi3.Schema.string().description("服务器 ID"),
+      name: import_koishi3.Schema.string().description("服务器 名称")
+    })).default([{ "id": "1", "name": "中心 鲁贝 1" }, { "id": "19", "name": "中心 斯特拉斯堡 1" }, { "id": "3", "name": "Steam 认证 API" }]).description("测试中心服务器")
+  }).description("测试中心服务器")
 ]).description("基础设置");
 function apply(ctx) {
   ctx.i18n.define("zh-CN", require_zh_CN());
@@ -920,7 +923,7 @@ function apply(ctx) {
       { id: "version", data: version }
     ]);
   });
-  ctx.command("slnews", "手动触发slnews发送到当前会话").action(async ({ session }) => {
+  ctx.command("slnews").action(async () => {
     const outMsg = await getNewsMsg(ctx, 1);
     if (outMsg.success) {
       return `${outMsg.msg}
@@ -933,7 +936,7 @@ ${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` }
   ctx.cron("0 * * * *", async () => {
     ctx.emit("node-async/news");
   });
-  ctx.cron("18 * * * *", async () => {
+  ctx.cron("30 * * * *", async () => {
     ctx.emit("node-async/news");
   });
   ctx.on("node-async/news", async () => {
@@ -987,15 +990,9 @@ ${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` }
   ctx.command("randomBA").alias("随机ba图").action(async ({ session }) => {
     await getBlueArchive(ctx, session);
   });
-  ctx.command("serverTest").alias("服之测测").action(async ({ session }) => {
-    const server = await serverTest(ctx, session);
-    if (server["success"] == 0) {
-      return session?.text(".msg", server);
-    } else if (server["success"] == 1) {
-      return session?.text(".forbidden", server);
-    } else {
-      return session?.text(".failed", server);
-    }
+  ctx.command("centerServerTest").alias("测测中心服务器").action(async ({ session }) => {
+    const msg = await centerServerTest(ctx, session);
+    return session?.text(msg.success, msg.data);
   });
   ctx.command("meme [序号:posint]").alias("memes").action(async ({ session }, count) => {
     await getMeme(ctx, session, count);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.22.1",
+  "version": "2.23.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -40,7 +40,6 @@
   "dependencies": {
     "@bbob/html": "^4.3.1",
     "@bbob/preset-html5": "^4.3.1",
-    "ping": "^1.0.0",
     "steam-server-query": "^1.1.3"
   }
 }