koishi-plugin-node-async-bot-all 1.9.5 → 1.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/fun.d.ts CHANGED
@@ -1,7 +1,6 @@
1
- import { Context } from "koishi";
2
1
  export declare function getSystemUsage(): Promise<object>;
3
2
  export declare function getHongKongTime(): string;
4
- export declare function fetchWithTimeout(url: string, options: {}, timeout: number, ctx: Context): Promise<Response>;
3
+ export declare function fetchWithTimeout(url: string, options: {}, timeout: number, log: any): Promise<Response>;
5
4
  export declare function readInfoFile(): Promise<string>;
6
5
  export declare function getAudioPath(name: string): Promise<string>;
7
6
  export declare function getAudioList(): Promise<string[]>;
package/lib/index.js CHANGED
@@ -51,7 +51,7 @@ var import_koishi = require("koishi");
51
51
  var import_os = __toESM(require("os"));
52
52
 
53
53
  // package.json
54
- var version = "1.9.4";
54
+ var version = "1.10.0";
55
55
 
56
56
  // src/fun.ts
57
57
  var import_fs = __toESM(require("fs"));
@@ -112,7 +112,7 @@ function getHongKongTime() {
112
112
  ].join(":");
113
113
  }
114
114
  __name(getHongKongTime, "getHongKongTime");
115
- async function fetchWithTimeout(url, options = {}, timeout = 5e3, ctx) {
115
+ async function fetchWithTimeout(url, options = {}, timeout = 5e3, log) {
116
116
  const controller = new AbortController();
117
117
  const timeoutId = setTimeout(() => {
118
118
  controller.abort();
@@ -124,11 +124,11 @@ async function fetchWithTimeout(url, options = {}, timeout = 5e3, ctx) {
124
124
  // 绑定终止信号
125
125
  });
126
126
  clearTimeout(timeoutId);
127
- ctx.logger.info(`Fetch code: ${response.status}`);
127
+ log.info(`Fetch code: ${response.status}`);
128
128
  return response;
129
129
  } catch (error) {
130
130
  clearTimeout(timeoutId);
131
- ctx.logger.error(`${error.name}: ${error.message}`);
131
+ log.error(`${error.name}: ${error.message}`);
132
132
  if (error.name === "AbortError") {
133
133
  throw new Error("请求超时");
134
134
  } else {
@@ -165,7 +165,8 @@ var import_fs2 = __toESM(require("fs"));
165
165
  var inject = ["silk"];
166
166
  var name = "node-async-bot-all";
167
167
  async function getServer(ctx, session) {
168
- 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}"}`);
168
+ const log = ctx.logger("cx");
169
+ log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
169
170
  let msg;
170
171
  let dataError;
171
172
  let data;
@@ -173,10 +174,10 @@ async function getServer(ctx, session) {
173
174
  const time = getHongKongTime();
174
175
  if (session.event.guild.id == "757729218" || session.event.guild.id == "1047732162") {
175
176
  try {
176
- const response = await fetchWithTimeout("https://api.tasaed.top/get/minecraftServer/", {}, 8e3, ctx);
177
+ const response = await fetchWithTimeout("https://api.tasaed.top/get/minecraftServer/", {}, 8e3, log);
177
178
  if (response.ok) {
178
179
  data = await response.text();
179
- ctx.logger.info("Server data: " + data);
180
+ log.info("Server data: " + data);
180
181
  data = JSON.parse(data);
181
182
  if (data["list"] == null) {
182
183
  msg = {
@@ -186,8 +187,8 @@ async function getServer(ctx, session) {
186
187
  "protocol": data["protocol"],
187
188
  "success": 3
188
189
  };
189
- ctx.logger.info("Sent:");
190
- ctx.logger.info(msg);
190
+ log.info("Sent:");
191
+ log.info(msg);
191
192
  } else {
192
193
  msg = {
193
194
  "time": time,
@@ -197,8 +198,8 @@ async function getServer(ctx, session) {
197
198
  "protocol": data["protocol"],
198
199
  "success": 0
199
200
  };
200
- ctx.logger.info("Sent:");
201
- ctx.logger.info(msg);
201
+ log.info("Sent:");
202
+ log.info(msg);
202
203
  }
203
204
  } else {
204
205
  dataError = await response.text();
@@ -219,43 +220,44 @@ async function getServer(ctx, session) {
219
220
  error = session.text(".unknown");
220
221
  }
221
222
  }
222
- ctx.logger.error(`Error fetching data: ${dataError}`);
223
+ log.error(`Error fetching data: ${dataError}`);
223
224
  msg = {
224
225
  "time": time,
225
226
  "data": error,
226
227
  "success": 1
227
228
  };
228
- ctx.logger.info("Sent:");
229
- ctx.logger.info(msg);
229
+ log.info("Sent:");
230
+ log.info(msg);
230
231
  }
231
232
  } catch (err) {
232
- ctx.logger.error(`Request error: ${err.message}`);
233
+ log.error(`Request error: ${err.message}`);
233
234
  msg = {
234
235
  "time": time,
235
236
  "data": session.text(".error"),
236
237
  "success": 1
237
238
  };
238
- ctx.logger.info("Sent:");
239
- ctx.logger.info(msg);
239
+ log.info("Sent:");
240
+ log.info(msg);
240
241
  }
241
242
  } else {
242
243
  msg = {
243
244
  "time": time,
244
245
  "success": 2
245
246
  };
246
- ctx.logger.info("Sent:");
247
- ctx.logger.info(msg);
247
+ log.info("Sent:");
248
+ log.info(msg);
248
249
  }
249
250
  return msg;
250
251
  }
251
252
  __name(getServer, "getServer");
252
253
  async function getStatus(ctx, session) {
253
- 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}"}`);
254
+ const log = ctx.logger("status");
255
+ log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
254
256
  const time = getHongKongTime();
255
257
  let msg;
256
258
  const vMsg = await getSystemUsage();
257
259
  if (vMsg["success"] == 1) {
258
- ctx.logger.error(vMsg);
260
+ log.error(vMsg);
259
261
  msg = {
260
262
  "time": time,
261
263
  "data": vMsg["data"],
@@ -270,13 +272,14 @@ async function getStatus(ctx, session) {
270
272
  "success": 0
271
273
  };
272
274
  }
273
- ctx.logger.info("Sent:");
274
- ctx.logger.info(msg);
275
+ log.info("Sent:");
276
+ log.info(msg);
275
277
  return msg;
276
278
  }
277
279
  __name(getStatus, "getStatus");
278
280
  async function getRandom(ctx, session, min, max) {
279
- 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}"}`);
281
+ const log = ctx.logger("random");
282
+ log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
280
283
  const time = getHongKongTime();
281
284
  let msg;
282
285
  let data;
@@ -292,18 +295,19 @@ async function getRandom(ctx, session, min, max) {
292
295
  "data": data,
293
296
  "success": 0
294
297
  };
295
- ctx.logger.info("Sent:");
296
- ctx.logger.info(msg);
298
+ log.info("Sent:");
299
+ log.info(msg);
297
300
  return msg;
298
301
  }
299
302
  __name(getRandom, "getRandom");
300
303
  async function getInfo(ctx, session) {
301
- 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}"}`);
304
+ const log = ctx.logger("info");
305
+ log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
302
306
  const time = getHongKongTime();
303
307
  let msg;
304
308
  let data = await readInfoFile();
305
309
  if (!data.includes("&time;")) {
306
- ctx.logger.error("Error: " + data);
310
+ log.error("Error: " + data);
307
311
  msg = {
308
312
  "time": time,
309
313
  "data": data,
@@ -317,52 +321,54 @@ async function getInfo(ctx, session) {
317
321
  "success": 0
318
322
  };
319
323
  }
320
- ctx.logger.info("Sent:");
321
- ctx.logger.info(msg);
324
+ log.info("Sent:");
325
+ log.info(msg);
322
326
  return msg;
323
327
  }
324
328
  __name(getInfo, "getInfo");
325
329
  async function getRW(ctx, session) {
326
- 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}"}`);
330
+ const log = ctx.logger("rw");
331
+ log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
327
332
  let msg;
328
333
  let data;
329
334
  const time = getHongKongTime();
330
335
  try {
331
- const response = await fetchWithTimeout("https://api.tasaed.top/rw/", {}, 8e3, ctx);
336
+ const response = await fetchWithTimeout("https://api.tasaed.top/rw/", {}, 8e3, log);
332
337
  if (response.ok) {
333
338
  data = await response.text();
334
- ctx.logger.info("Server data: " + data);
339
+ log.info("Server data: " + data);
335
340
  msg = {
336
341
  "time": time,
337
342
  "data": data,
338
343
  "success": 0
339
344
  };
340
- ctx.logger.info("Sent:");
341
- ctx.logger.info(msg);
345
+ log.info("Sent:");
346
+ log.info(msg);
342
347
  } else {
343
348
  data = await response.text();
344
- ctx.logger.error(`Error fetching data: ${data}`);
349
+ log.error(`Error fetching data: ${data}`);
345
350
  msg = {
346
351
  "time": time,
347
352
  "success": 1
348
353
  };
349
- ctx.logger.info("Sent:");
350
- ctx.logger.info(msg);
354
+ log.info("Sent:");
355
+ log.info(msg);
351
356
  }
352
357
  } catch (err) {
353
- ctx.logger.error(`Request error: ${err.message}`);
358
+ log.error(`Request error: ${err.message}`);
354
359
  msg = {
355
360
  "time": time,
356
361
  "success": 2
357
362
  };
358
- ctx.logger.info("Sent:");
359
- ctx.logger.info(msg);
363
+ log.info("Sent:");
364
+ log.info(msg);
360
365
  }
361
366
  return msg;
362
367
  }
363
368
  __name(getRW, "getRW");
364
369
  async function getCASSIE(ctx, session, name2) {
365
- 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}"}`);
370
+ const log = ctx.logger("cassie");
371
+ log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
366
372
  let msg;
367
373
  const time = getHongKongTime();
368
374
  const list = await getAudioList();
@@ -372,26 +378,26 @@ async function getCASSIE(ctx, session, name2) {
372
378
  "data": list.map((fruit, index) => `${index + 1}. ${fruit}`).join("\n"),
373
379
  "success": 1
374
380
  };
375
- ctx.logger.info("Sent: .msg");
376
- ctx.logger.info(msg);
381
+ log.info("Sent: .msg");
382
+ log.info(msg);
377
383
  return msg;
378
384
  } else if (list.includes(name2)) {
379
385
  const fullPath = await getAudioPath(name2);
380
386
  try {
381
387
  const fileBuffer = await import_fs2.default.promises.readFile(fullPath);
382
- ctx.logger.info(fullPath);
388
+ log.info(fullPath);
383
389
  const bufferToSend = Buffer.from(fileBuffer);
384
390
  if (!ctx.silk.isSilk(fileBuffer)) {
385
391
  msg = {
386
392
  "time": time,
387
393
  "success": 2
388
394
  };
389
- ctx.logger.error("发送失败:非 .slk 文件");
390
- ctx.logger.info("Sent: .failed");
391
- ctx.logger.info(msg);
395
+ log.error("发送失败:非 .slk 文件");
396
+ log.info("Sent: .failed");
397
+ log.info(msg);
392
398
  } else {
393
399
  const base64Data = bufferToSend.toString("base64");
394
- ctx.logger.info("Sent: A audio file.");
400
+ log.info("Sent: A audio file.");
395
401
  msg = {
396
402
  "time": time,
397
403
  "data": base64Data,
@@ -404,9 +410,9 @@ async function getCASSIE(ctx, session, name2) {
404
410
  "time": time,
405
411
  "success": 2
406
412
  };
407
- ctx.logger.error("发送失败:" + e.message);
408
- ctx.logger.info("Sent: .failed");
409
- ctx.logger.info(msg);
413
+ log.error("发送失败:" + e.message);
414
+ log.info("Sent: .failed");
415
+ log.info(msg);
410
416
  return msg;
411
417
  }
412
418
  } else {
@@ -414,8 +420,8 @@ async function getCASSIE(ctx, session, name2) {
414
420
  "time": time,
415
421
  "success": 3
416
422
  };
417
- ctx.logger.info("Sent: .unknown");
418
- ctx.logger.info(msg);
423
+ log.info("Sent: .unknown");
424
+ log.info(msg);
419
425
  return msg;
420
426
  }
421
427
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "koishi-plugin-node-async-bot-all",
3
3
  "description": "NodeAsync Bot插件(自用)",
4
- "version": "1.9.5",
4
+ "version": "1.10.0",
5
5
  "main": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",
7
7
  "contributors": [