koishi-plugin-node-async-bot-all 1.4.1 → 1.4.3

package/lib/index.js

@@ -39,10 +39,10 @@ module.exports = __toCommonJS(src_exports);
 var import_os = __toESM(require("os"));
 
 // package.json
-var version = "1.4.1";
+var version = "1.4.3";
 
 // res/i18n.yaml
-var i18n_default = { rw: { failed1: "获取失败（1）。", failed2: "获取失败（2）。" }, cx: { forbidden: "此指令不允许在本群使用。", notice: "进服指南请在群公告中查看。", players: "服务器当前人数", failed: "查询失败：", timeout: "请求超时。", later: "请稍后重试。", unknown: "未知错误。" }, status: { failed: "状态获取失败。", name: "系统名称：", cpu: "CPU使用率：", memory: "内存使用率：" }, random: { sc: "生成的随机数：" }, info: { failed: "读取信息失败。" } };
+var i18n_default = { rw: { failed1: "获取失败（1）。", failed2: "获取失败（2）。" }, cx: { forbidden: "此指令不允许在本群使用。", notice: "进服指南请在群公告中查看。", players: "服务器当前人数", failed: "查询失败：", timeout: "请求超时。", later: "请稍后重试。", unknown: "未知错误。", close: "服务器已关闭。" }, status: { failed: "状态获取失败。", name: "系统名称：", cpu: "CPU使用率：", memory: "内存使用率：" }, random: { sc: "生成的随机数：" }, info: { failed: "读取信息失败。" } };
 
 // src/fun.ts
 function getSystemName() {
@@ -81,23 +81,18 @@ ${i18n_default.status.memory}${getMemoryUsage()}%`;
 }
 __name(getSystemUsage, "getSystemUsage");
 function getHongKongTime() {
-  const date = /* @__PURE__ */ new Date();
-  const formatter = new Intl.DateTimeFormat("en", {
-    timeZone: "Asia/Hong_Kong",
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit",
-    hour12: false
-  });
-  const parts = formatter.formatToParts(date);
-  const partMap = {};
-  parts.forEach((part) => {
-    partMap[part.type] = part.value;
-  });
-  return `${partMap.year}-${partMap.month}-${partMap.day} ${partMap.hour}:${partMap.minute}:${partMap.second}`;
+  const now = /* @__PURE__ */ new Date();
+  const hkOffset = 8 * 60;
+  const hkTime = new Date(now.getTime() + (hkOffset + now.getTimezoneOffset()) * 6e4);
+  return [
+    hkTime.getFullYear(),
+    (hkTime.getMonth() + 1).toString().padStart(2, "0"),
+    hkTime.getDate().toString().padStart(2, "0")
+  ].join("-") + " " + [
+    hkTime.getHours().toString().padStart(2, "0"),
+    hkTime.getMinutes().toString().padStart(2, "0"),
+    hkTime.getSeconds().toString().padStart(2, "0")
+  ].join(":");
 }
 __name(getHongKongTime, "getHongKongTime");
 async function fetchWithTimeout(url, options = {}, timeout = 5e3) {
@@ -141,7 +136,7 @@ __name(readInfoFile, "readInfoFile");
 // src/index.ts
 var name = "node-async-bot-all";
 async function getServer(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"`);
+  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   let msg;
   let dataError;
   let data;
@@ -164,6 +159,9 @@ ${i18n_default.cx.notice}`;
         try {
           const vError = JSON.parse(dataError);
           error = vError["data"];
+          if (error.includes("Connection refused")) {
+            error = i18n_default.cx.close;
+          }
         } catch (e) {
           if (dataError.includes("CDN节点请求源服务器超时")) {
             error = i18n_default.cx.timeout;
@@ -193,7 +191,7 @@ ${i18n_default.cx.forbidden}`;
 }
 __name(getServer, "getServer");
 async function getStatus(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"`);
+  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   const time = getHongKongTime();
   let msg;
   const vMsg = await getSystemUsage();
@@ -210,7 +208,7 @@ ${i18n_default.status.failed}`;
 }
 __name(getStatus, "getStatus");
 async function getRandom(ctx, session, min, max) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"`);
+  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   const time = getHongKongTime();
   let msg;
   if (min == void 0 || max == void 0) {
@@ -226,7 +224,7 @@ ${i18n_default.random.sc}` + (Math.floor(Math.random() * (max - min + 1)) + min)
 }
 __name(getRandom, "getRandom");
 async function getInfo(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"`);
+  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   const time = getHongKongTime();
   let msg = await readInfoFile();
   if (!msg.includes("基沃托斯·工业革命")) {
@@ -241,7 +239,7 @@ ${i18n_default.info.failed}`;
 }
 __name(getInfo, "getInfo");
 async function getRW(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"`);
+  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   let msg;
   let data;
   const time = getHongKongTime();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/res/i18n.yaml

@@ -9,6 +9,7 @@ cx:
   timeout: 请求超时。
   later: 请稍后重试。
   unknown: 未知错误。
+  close: 服务器已关闭。
 status:
   failed: 状态获取失败。
   name: 系统名称：