node-karin 1.3.19 → 1.3.20
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/CHANGELOG.md +8 -0
- package/dist/index.js +110 -102
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# 更新日志
|
|
2
2
|
|
|
3
|
+
## [1.3.20](https://github.com/KarinJS/Karin/compare/core-v1.3.19...core-v1.3.20) (2025-02-26)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### 🐛 Bug Fixes
|
|
7
|
+
|
|
8
|
+
* cause error ([140831f](https://github.com/KarinJS/Karin/commit/140831fe99da39506278838ca7afc3a7deca92b8))
|
|
9
|
+
* middleware ([8a7896e](https://github.com/KarinJS/Karin/commit/8a7896ebec77716069d9a31dc3db2da6669ca0c4))
|
|
10
|
+
|
|
3
11
|
## [1.3.19](https://github.com/KarinJS/Karin/compare/core-v1.3.18...core-v1.3.19) (2025-02-25)
|
|
4
12
|
|
|
5
13
|
|
package/dist/index.js
CHANGED
|
@@ -3043,15 +3043,14 @@ headers: ${JSON.stringify(req.headers)}
|
|
|
3043
3043
|
body: ${JSON.stringify(req.body)}
|
|
3044
3044
|
`
|
|
3045
3045
|
);
|
|
3046
|
-
if (req.path.startsWith("/
|
|
3047
|
-
|
|
3048
|
-
|
|
3049
|
-
|
|
3050
|
-
|
|
3051
|
-
|
|
3052
|
-
|
|
3053
|
-
|
|
3054
|
-
}
|
|
3046
|
+
if (req.path === "/ping" || req.path.startsWith("/console")) {
|
|
3047
|
+
next();
|
|
3048
|
+
return;
|
|
3049
|
+
}
|
|
3050
|
+
if (!auth.getAuth(req)) {
|
|
3051
|
+
createUnauthorizedResponse(res, "\u9519\u8BEF\u7684token");
|
|
3052
|
+
logger.error(`[express][${req.ip}] \u9274\u6743\u9519\u8BEF: /api/v1/${req.path}`);
|
|
3053
|
+
return;
|
|
3055
3054
|
}
|
|
3056
3055
|
next();
|
|
3057
3056
|
};
|
|
@@ -4481,78 +4480,6 @@ var init_console = __esm({
|
|
|
4481
4480
|
}
|
|
4482
4481
|
});
|
|
4483
4482
|
|
|
4484
|
-
// src/utils/system/restart.ts
|
|
4485
|
-
var restart, restartDirect;
|
|
4486
|
-
var init_restart = __esm({
|
|
4487
|
-
"src/utils/system/restart.ts"() {
|
|
4488
|
-
"use strict";
|
|
4489
|
-
init_esm_shims();
|
|
4490
|
-
init_exec();
|
|
4491
|
-
restart = async (selfId, contact3, messageId, isFront = true) => {
|
|
4492
|
-
const options = {
|
|
4493
|
-
selfId,
|
|
4494
|
-
contact: contact3,
|
|
4495
|
-
messageId,
|
|
4496
|
-
time: Date.now()
|
|
4497
|
-
};
|
|
4498
|
-
const key = `karin:restart:${selfId}`;
|
|
4499
|
-
const { level: level2 } = await Promise.resolve().then(() => (init_index(), index_exports));
|
|
4500
|
-
await level2.set(key, options);
|
|
4501
|
-
if (isFront && process.send) {
|
|
4502
|
-
process.send("restart");
|
|
4503
|
-
return { status: "success", data: "\u5DF2\u53D1\u9001\u91CD\u542F\u4FE1\u53F7" };
|
|
4504
|
-
}
|
|
4505
|
-
if (process.env.PM2_RESTART === "true") process.exit();
|
|
4506
|
-
if (process.env.pm_id) {
|
|
4507
|
-
const { error: error2 } = await exec("npx karin rs");
|
|
4508
|
-
if (error2) return { status: "failed", data: error2 };
|
|
4509
|
-
process.exit();
|
|
4510
|
-
}
|
|
4511
|
-
const { error } = await exec("npx karin pm2");
|
|
4512
|
-
if (error) return { status: "failed", data: error };
|
|
4513
|
-
process.exit();
|
|
4514
|
-
};
|
|
4515
|
-
restartDirect = async () => {
|
|
4516
|
-
logger.mark("\u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u6B63\u5728\u91CD\u542F...");
|
|
4517
|
-
if (process.env.RUNTIME === "pm2") {
|
|
4518
|
-
await exec(`pm2 restart ${process.env.pm_id}`);
|
|
4519
|
-
return;
|
|
4520
|
-
}
|
|
4521
|
-
if (process.env.RUNTIME === "tsx") {
|
|
4522
|
-
throw new Error("tsx \u4E0D\u652F\u6301\u91CD\u542F");
|
|
4523
|
-
}
|
|
4524
|
-
if (process == null ? void 0 : process.send) {
|
|
4525
|
-
process.send("restart");
|
|
4526
|
-
logger.mark("\u53D1\u9001\u91CD\u542F\u4FE1\u53F7\u6210\u529F");
|
|
4527
|
-
}
|
|
4528
|
-
};
|
|
4529
|
-
}
|
|
4530
|
-
});
|
|
4531
|
-
|
|
4532
|
-
// src/server/api/manage.ts
|
|
4533
|
-
var restartRouter, exitRouter;
|
|
4534
|
-
var init_manage = __esm({
|
|
4535
|
-
"src/server/api/manage.ts"() {
|
|
4536
|
-
"use strict";
|
|
4537
|
-
init_esm_shims();
|
|
4538
|
-
init_router();
|
|
4539
|
-
init_restart();
|
|
4540
|
-
init_response();
|
|
4541
|
-
restartRouter = async (_req, res) => {
|
|
4542
|
-
createSuccessResponse(res, null, "\u6307\u4EE4\u53D1\u9001\u6210\u529F");
|
|
4543
|
-
restartDirect();
|
|
4544
|
-
};
|
|
4545
|
-
exitRouter = async (_req, res) => {
|
|
4546
|
-
logger.mark("\u6536\u5230\u9000\u51FA\u8BF7\u6C42\uFF0C\u6B63\u5728\u9000\u51FA...");
|
|
4547
|
-
createSuccessResponse(res, null, "\u9000\u51FA\u6210\u529F");
|
|
4548
|
-
const { processExit: processExit3 } = await Promise.resolve().then(() => (init_process2(), process_exports));
|
|
4549
|
-
await processExit3(0);
|
|
4550
|
-
};
|
|
4551
|
-
router.post("/exit", exitRouter);
|
|
4552
|
-
router.post("/restart", restartRouter);
|
|
4553
|
-
}
|
|
4554
|
-
});
|
|
4555
|
-
|
|
4556
4483
|
// src/server/api/file/get.ts
|
|
4557
4484
|
var arrayTotext, getBasicConfig, getAdapterConfig, getGroupsConfig, getPrivatesConfig, getRendersConfig, getPM2Config, getRedisConfig, getEnvConfig, getFileRouter;
|
|
4558
4485
|
var init_get = __esm({
|
|
@@ -5505,28 +5432,85 @@ var init_file3 = __esm({
|
|
|
5505
5432
|
}
|
|
5506
5433
|
});
|
|
5507
5434
|
|
|
5508
|
-
// src/
|
|
5509
|
-
var
|
|
5510
|
-
var
|
|
5511
|
-
"src/
|
|
5435
|
+
// src/utils/system/restart.ts
|
|
5436
|
+
var restart, restartDirect;
|
|
5437
|
+
var init_restart = __esm({
|
|
5438
|
+
"src/utils/system/restart.ts"() {
|
|
5439
|
+
"use strict";
|
|
5440
|
+
init_esm_shims();
|
|
5441
|
+
init_exec();
|
|
5442
|
+
restart = async (selfId, contact3, messageId, isFront = true) => {
|
|
5443
|
+
const options = {
|
|
5444
|
+
selfId,
|
|
5445
|
+
contact: contact3,
|
|
5446
|
+
messageId,
|
|
5447
|
+
time: Date.now()
|
|
5448
|
+
};
|
|
5449
|
+
const key = `karin:restart:${selfId}`;
|
|
5450
|
+
const { level: level2 } = await Promise.resolve().then(() => (init_index(), index_exports));
|
|
5451
|
+
await level2.set(key, options);
|
|
5452
|
+
if (isFront && process.send) {
|
|
5453
|
+
process.send("restart");
|
|
5454
|
+
return { status: "success", data: "\u5DF2\u53D1\u9001\u91CD\u542F\u4FE1\u53F7" };
|
|
5455
|
+
}
|
|
5456
|
+
if (process.env.PM2_RESTART === "true") process.exit();
|
|
5457
|
+
if (process.env.pm_id) {
|
|
5458
|
+
const { error: error2 } = await exec("npx karin rs");
|
|
5459
|
+
if (error2) return { status: "failed", data: error2 };
|
|
5460
|
+
process.exit();
|
|
5461
|
+
}
|
|
5462
|
+
const { error } = await exec("npx karin pm2");
|
|
5463
|
+
if (error) return { status: "failed", data: error };
|
|
5464
|
+
process.exit();
|
|
5465
|
+
};
|
|
5466
|
+
restartDirect = async () => {
|
|
5467
|
+
logger.mark("\u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u6B63\u5728\u91CD\u542F...");
|
|
5468
|
+
if (process.env.RUNTIME === "pm2") {
|
|
5469
|
+
await exec(`pm2 restart ${process.env.pm_id}`);
|
|
5470
|
+
return;
|
|
5471
|
+
}
|
|
5472
|
+
if (process.env.RUNTIME === "tsx") {
|
|
5473
|
+
throw new Error("tsx \u4E0D\u652F\u6301\u91CD\u542F");
|
|
5474
|
+
}
|
|
5475
|
+
if (process == null ? void 0 : process.send) {
|
|
5476
|
+
process.send("restart");
|
|
5477
|
+
logger.mark("\u53D1\u9001\u91CD\u542F\u4FE1\u53F7\u6210\u529F");
|
|
5478
|
+
}
|
|
5479
|
+
};
|
|
5480
|
+
}
|
|
5481
|
+
});
|
|
5482
|
+
|
|
5483
|
+
// src/server/api/system/manage.ts
|
|
5484
|
+
var restartRouter, exitRouter;
|
|
5485
|
+
var init_manage = __esm({
|
|
5486
|
+
"src/server/api/system/manage.ts"() {
|
|
5512
5487
|
"use strict";
|
|
5513
5488
|
init_esm_shims();
|
|
5514
|
-
init_response();
|
|
5515
5489
|
init_router();
|
|
5516
|
-
|
|
5517
|
-
|
|
5490
|
+
init_restart();
|
|
5491
|
+
init_response();
|
|
5492
|
+
restartRouter = async (_req, res) => {
|
|
5493
|
+
createSuccessResponse(res, null, "\u6307\u4EE4\u53D1\u9001\u6210\u529F");
|
|
5494
|
+
restartDirect();
|
|
5518
5495
|
};
|
|
5519
|
-
|
|
5496
|
+
exitRouter = async (_req, res) => {
|
|
5497
|
+
logger.mark("\u6536\u5230\u9000\u51FA\u8BF7\u6C42\uFF0C\u6B63\u5728\u9000\u51FA...");
|
|
5498
|
+
createSuccessResponse(res, null, "\u9000\u51FA\u6210\u529F");
|
|
5499
|
+
const { processExit: processExit3 } = await Promise.resolve().then(() => (init_process2(), process_exports));
|
|
5500
|
+
await processExit3(0);
|
|
5501
|
+
};
|
|
5502
|
+
router.post("/exit", exitRouter);
|
|
5503
|
+
router.post("/restart", restartRouter);
|
|
5520
5504
|
}
|
|
5521
5505
|
});
|
|
5522
5506
|
|
|
5523
|
-
// src/server/api/log.ts
|
|
5507
|
+
// src/server/api/system/log.ts
|
|
5524
5508
|
import fs18 from "node:fs";
|
|
5525
5509
|
import moment from "moment";
|
|
5526
5510
|
import path12 from "node:path";
|
|
5527
5511
|
var logRouter, activeConnections, getLogRouter;
|
|
5528
5512
|
var init_log = __esm({
|
|
5529
|
-
"src/server/api/log.ts"() {
|
|
5513
|
+
"src/server/api/system/log.ts"() {
|
|
5530
5514
|
"use strict";
|
|
5531
5515
|
init_esm_shims();
|
|
5532
5516
|
init_root();
|
|
@@ -5596,6 +5580,32 @@ var init_log = __esm({
|
|
|
5596
5580
|
}
|
|
5597
5581
|
});
|
|
5598
5582
|
|
|
5583
|
+
// src/server/api/system/login.ts
|
|
5584
|
+
var loginRouter;
|
|
5585
|
+
var init_login = __esm({
|
|
5586
|
+
"src/server/api/system/login.ts"() {
|
|
5587
|
+
"use strict";
|
|
5588
|
+
init_esm_shims();
|
|
5589
|
+
init_router();
|
|
5590
|
+
init_response();
|
|
5591
|
+
loginRouter = async (_req, res) => {
|
|
5592
|
+
createSuccessResponse(res, null, "\u767B\u5F55\u6210\u529F");
|
|
5593
|
+
};
|
|
5594
|
+
router.post("/login", loginRouter);
|
|
5595
|
+
}
|
|
5596
|
+
});
|
|
5597
|
+
|
|
5598
|
+
// src/server/api/system/index.ts
|
|
5599
|
+
var init_system = __esm({
|
|
5600
|
+
"src/server/api/system/index.ts"() {
|
|
5601
|
+
"use strict";
|
|
5602
|
+
init_esm_shims();
|
|
5603
|
+
init_manage();
|
|
5604
|
+
init_log();
|
|
5605
|
+
init_login();
|
|
5606
|
+
}
|
|
5607
|
+
});
|
|
5608
|
+
|
|
5599
5609
|
// src/utils/message/index.ts
|
|
5600
5610
|
var init_message2 = __esm({
|
|
5601
5611
|
"src/utils/message/index.ts"() {
|
|
@@ -11892,10 +11902,8 @@ var init_api = __esm({
|
|
|
11892
11902
|
init_info();
|
|
11893
11903
|
init_root2();
|
|
11894
11904
|
init_console();
|
|
11895
|
-
init_manage();
|
|
11896
11905
|
init_file3();
|
|
11897
|
-
|
|
11898
|
-
init_log();
|
|
11906
|
+
init_system();
|
|
11899
11907
|
init_sandbox();
|
|
11900
11908
|
init_plugins();
|
|
11901
11909
|
}
|
|
@@ -16273,7 +16281,7 @@ var init_button = __esm({
|
|
|
16273
16281
|
import os3 from "node:os";
|
|
16274
16282
|
import fs29 from "node:fs";
|
|
16275
16283
|
var isWin2, isLinux, isMac, isDocker, isRoot;
|
|
16276
|
-
var
|
|
16284
|
+
var init_system2 = __esm({
|
|
16277
16285
|
"src/utils/system/system.ts"() {
|
|
16278
16286
|
"use strict";
|
|
16279
16287
|
init_esm_shims();
|
|
@@ -16292,7 +16300,7 @@ var init_pid = __esm({
|
|
|
16292
16300
|
"use strict";
|
|
16293
16301
|
init_esm_shims();
|
|
16294
16302
|
init_exec();
|
|
16295
|
-
|
|
16303
|
+
init_system2();
|
|
16296
16304
|
getPid = async (port2) => {
|
|
16297
16305
|
const command2 = isWin2 ? `netstat -ano | findstr :${port2}` : `lsof -i:${port2} | grep LISTEN | awk '{print $2}'`;
|
|
16298
16306
|
const { stdout } = await exec(command2);
|
|
@@ -16411,7 +16419,7 @@ __export(system_exports, {
|
|
|
16411
16419
|
updatePkg: () => updatePkg,
|
|
16412
16420
|
uptime: () => uptime2
|
|
16413
16421
|
});
|
|
16414
|
-
var
|
|
16422
|
+
var init_system3 = __esm({
|
|
16415
16423
|
"src/utils/system/index.ts"() {
|
|
16416
16424
|
"use strict";
|
|
16417
16425
|
init_esm_shims();
|
|
@@ -16423,7 +16431,7 @@ var init_system2 = __esm({
|
|
|
16423
16431
|
init_error();
|
|
16424
16432
|
init_ffmpeg();
|
|
16425
16433
|
init_import();
|
|
16426
|
-
|
|
16434
|
+
init_system2();
|
|
16427
16435
|
init_update();
|
|
16428
16436
|
init_restart();
|
|
16429
16437
|
init_fileToUrl();
|
|
@@ -16438,10 +16446,10 @@ var init_utils = __esm({
|
|
|
16438
16446
|
init_button();
|
|
16439
16447
|
init_fs2();
|
|
16440
16448
|
init_logger();
|
|
16441
|
-
|
|
16449
|
+
init_system3();
|
|
16442
16450
|
init_message2();
|
|
16443
16451
|
init_fs2();
|
|
16444
|
-
|
|
16452
|
+
init_system3();
|
|
16445
16453
|
init_common();
|
|
16446
16454
|
init_config2();
|
|
16447
16455
|
init_changelog();
|
|
@@ -16564,7 +16572,7 @@ var init_client2 = __esm({
|
|
|
16564
16572
|
this.registerBot();
|
|
16565
16573
|
} catch (error) {
|
|
16566
16574
|
this.socket.close();
|
|
16567
|
-
throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}
|
|
16575
|
+
throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}`, { cause: error });
|
|
16568
16576
|
}
|
|
16569
16577
|
}
|
|
16570
16578
|
};
|
|
@@ -16639,7 +16647,7 @@ var init_server2 = __esm({
|
|
|
16639
16647
|
});
|
|
16640
16648
|
} catch (error) {
|
|
16641
16649
|
this.socket.close();
|
|
16642
|
-
throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}
|
|
16650
|
+
throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}`, { cause: error });
|
|
16643
16651
|
}
|
|
16644
16652
|
}
|
|
16645
16653
|
/**
|