@whyour/qinglong 2.21.0 → 2.22.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/.dockerignore +13 -0
- package/.env.example +7 -0
- package/AGENTS.md +2 -2
- package/README-en.md +24 -0
- package/README.md +24 -0
- package/back/protos/api.proto +9 -1
- package/back/protos/cron.proto +4 -1
- package/deploy/kubernetes/README.md +81 -0
- package/deploy/kubernetes/base/kustomization.yaml +5 -0
- package/deploy/kubernetes/base/qinglong.yaml +95 -0
- package/deploy/kubernetes/overlays/example/kustomization.yaml +10 -0
- package/docker/Dockerfile +31 -12
- package/docker/Dockerfile.310 +31 -12
- package/docker/Dockerfile.debian +22 -14
- package/docker/Dockerfile.debian310 +24 -14
- package/docker/build-manifest.cjs +28 -0
- package/docker/verify-build.cjs +49 -0
- package/docs/releases/2.22.0-validation.md +49 -0
- package/docs/releases/2.22.0.md +54 -0
- package/ecosystem.config.js +10 -1
- package/package.json +11 -6
- package/sample/config.sample.sh +17 -2
- package/sample/notify.js +118 -0
- package/sample/notify.py +93 -0
- package/scripts/benchmark-execution.cjs +96 -0
- package/scripts/write-build-info.cjs +27 -0
- package/shell/api.sh +41 -14
- package/shell/check.sh +59 -19
- package/shell/lang/en.sh +6 -0
- package/shell/lang/zh.sh +6 -0
- package/shell/node_path_cache.sh +128 -0
- package/shell/otask.sh +10 -1
- package/shell/preload/sitecustomize.js +5 -1
- package/shell/share.sh +26 -9
- package/shell/start.sh +6 -3
- package/shell/task.sh +13 -3
- package/shell/update.sh +65 -4
- package/static/build/api/clientIp.js +42 -0
- package/static/build/api/config.js +8 -16
- package/static/build/api/cron.js +39 -3
- package/static/build/api/dashboard.js +50 -6
- package/static/build/api/env.js +2 -2
- package/static/build/api/health.js +2 -2
- package/static/build/api/index.js +4 -0
- package/static/build/api/log.js +39 -19
- package/static/build/api/retention.js +63 -0
- package/static/build/api/script.js +23 -22
- package/static/build/api/subscription.js +16 -2
- package/static/build/api/system.js +31 -9
- package/static/build/api/user.js +75 -15
- package/static/build/app.js +63 -54
- package/static/build/bootstrap/database.js +51 -0
- package/static/build/config/const.js +2 -0
- package/static/build/config/grpcCerts.js +4 -4
- package/static/build/config/index.js +0 -4
- package/static/build/config/share.js +5 -4
- package/static/build/config/util.js +136 -41
- package/static/build/data/cron.js +1 -0
- package/static/build/data/notify.js +18 -1
- package/static/build/data/sock.js +1 -0
- package/static/build/loaders/app.js +8 -6
- package/static/build/loaders/db.js +5 -35
- package/static/build/loaders/deps.js +30 -22
- package/static/build/loaders/express.js +44 -32
- package/static/build/loaders/initData.js +10 -7
- package/static/build/loaders/initFile.js +1 -1
- package/static/build/loaders/initTask.js +3 -2
- package/static/build/loaders/server.js +1 -1
- package/static/build/loaders/sock.js +72 -6
- package/static/build/middlewares/monitoring.js +12 -33
- package/static/build/middlewares/protectedPathCase.js +17 -0
- package/static/build/protos/api.js +78 -2
- package/static/build/protos/cron.js +21 -4
- package/static/build/protos/health.js +1 -1
- package/static/build/schedule/addCron.js +76 -10
- package/static/build/schedule/api.js +5 -2
- package/static/build/schedule/client.js +38 -6
- package/static/build/schedule/delCron.js +11 -1
- package/static/build/schedule/health.js +72 -7
- package/static/build/services/config.js +5 -42
- package/static/build/services/cron.js +353 -164
- package/static/build/services/dependence.js +66 -18
- package/static/build/services/grpc.js +2 -2
- package/static/build/services/health.js +4 -7
- package/static/build/services/http.js +9 -3
- package/static/build/services/log.js +2 -3
- package/static/build/services/metrics.js +46 -14
- package/static/build/services/notify.js +73 -5
- package/static/build/services/retention.js +123 -0
- package/static/build/services/schedule.js +57 -33
- package/static/build/services/script.js +4 -5
- package/static/build/services/subscription.js +57 -34
- package/static/build/services/system.js +49 -11
- package/static/build/services/user.js +244 -31
- package/static/build/shared/auth.js +22 -3
- package/static/build/shared/authMutation.js +17 -0
- package/static/build/shared/childProcess.js +82 -0
- package/static/build/shared/clientIp.js +27 -0
- package/static/build/shared/errors.js +9 -0
- package/static/build/shared/fileAccess.js +60 -0
- package/static/build/shared/i18n.js +62 -4
- package/static/build/shared/logReader.js +85 -0
- package/static/build/shared/logStreamManager.js +80 -60
- package/static/build/shared/pLimit.js +3 -2
- package/static/build/shared/password.js +30 -0
- package/static/build/shared/retention.js +58 -0
- package/static/build/shared/runCron.js +28 -15
- package/static/build/shared/schedulerMutationLock.js +44 -0
- package/static/build/shared/schedulerReadiness.js +82 -0
- package/static/build/shared/schemaMigrations.js +58 -0
- package/static/build/shared/startupProcess.js +48 -0
- package/static/build/shared/store.js +7 -0
- package/static/build/shared/trustProxy.js +119 -0
- package/static/build/validation/schedule.js +12 -3
- package/static/dist/{1885.e1ea09f6.async.js → 1885.b8f427bf.async.js} +1 -1
- package/static/dist/2031.6af40025.async.js +1 -0
- package/static/dist/2693.51c2636b.async.js +1 -0
- package/static/dist/{2890.9e373f5b.async.js → 2890.add55e85.async.js} +1 -1
- package/static/dist/2901.2ca95295.async.js +1 -0
- package/static/dist/445.a65ff63b.async.js +1 -0
- package/static/dist/4736.1d2b5cb6.async.js +1 -0
- package/static/dist/{4859.6592cebb.async.js → 4859.97d6653c.async.js} +1 -1
- package/static/dist/{6013.4e38de36.async.js → 6013.db535339.async.js} +1 -1
- package/static/dist/6212.9e6d9913.async.js +1 -0
- package/static/dist/{6339.ab305e96.async.js → 6431.4603ad0e.async.js} +1 -1
- package/static/dist/{6872.42f939f1.async.js → 6872.a503ef55.async.js} +1 -1
- package/static/dist/7231.f7e5b668.async.js +1 -0
- package/static/dist/{7355.f9f263d8.async.js → 7355.fca746f5.async.js} +1 -1
- package/static/dist/{7508.7dcee91c.async.js → 7508.d90eac63.async.js} +1 -1
- package/static/dist/{7984.594296a5.async.js → 7984.eaac7402.async.js} +1 -1
- package/static/dist/8844.a0fef08e.async.js +1 -0
- package/static/dist/index.html +2 -2
- package/static/dist/layouts__index.633d3553.async.js +1 -0
- package/static/dist/preload_helper.cf7de3fa.js +1 -0
- package/static/dist/{src__pages__config__index.a22ff7dc.async.js → src__pages__config__index.9aba4054.async.js} +1 -1
- package/static/dist/src__pages__crontab__detail.86b2eebb.async.js +1 -0
- package/static/dist/src__pages__crontab__index.ae4e06f2.async.js +1 -0
- package/static/dist/{src__pages__crontab__logModal.0b8cce8c.async.js → src__pages__crontab__logModal.930535e2.async.js} +1 -1
- package/static/dist/src__pages__crontab__modal.a2c8fdcc.async.js +1 -0
- package/static/dist/src__pages__crontab__viewCreateModal.7b4f9cbe.async.js +1 -0
- package/static/dist/src__pages__crontab__viewManageModal.cd454ea0.async.js +1 -0
- package/static/dist/src__pages__dashboard__index.243c5a35.async.js +1 -0
- package/static/dist/src__pages__dashboard__taskResultModal.7795d6e1.async.js +1 -0
- package/static/dist/src__pages__dependence__index.874d501f.async.js +1 -0
- package/static/dist/src__pages__dependence__logModal.154efe7a.async.js +1 -0
- package/static/dist/src__pages__dependence__modal.a29c1a0f.async.js +1 -0
- package/static/dist/{src__pages__diff__index.013b7c75.async.js → src__pages__diff__index.1714b941.async.js} +1 -1
- package/static/dist/src__pages__env__editNameModal.c13d47d2.async.js +1 -0
- package/static/dist/src__pages__env__index.fd6fd2b0.async.js +1 -0
- package/static/dist/src__pages__env__modal.4d71adb3.async.js +1 -0
- package/static/dist/src__pages__error__index.aae50c94.async.js +1 -0
- package/static/dist/src__pages__initialization__index.82a2e967.async.js +1 -0
- package/static/dist/src__pages__log__index.71250e0d.async.js +1 -0
- package/static/dist/{src__pages__login__index.8c813eb1.async.js → src__pages__login__index.a0fd5ed8.async.js} +1 -1
- package/static/dist/src__pages__script__editModal.22acdf7c.async.js +1 -0
- package/static/dist/src__pages__script__editNameModal.1a521cc0.async.js +1 -0
- package/static/dist/src__pages__script__index.a18b2692.async.js +1 -0
- package/static/dist/src__pages__script__renameModal.0ab029e7.async.js +1 -0
- package/static/dist/src__pages__script__saveModal.8965b74c.async.js +1 -0
- package/static/dist/src__pages__script__setting.35ad4f02.async.js +1 -0
- package/static/dist/src__pages__setting__appModal.7eaeb9d3.async.js +1 -0
- package/static/dist/src__pages__setting__checkUpdate.d175b154.async.js +1 -0
- package/static/dist/src__pages__setting__clientIp.3a8711ed.async.js +1 -0
- package/static/dist/src__pages__setting__dependence.9c0f749b.async.js +1 -0
- package/static/dist/src__pages__setting__index.cb397741.async.js +1 -0
- package/static/dist/src__pages__setting__loginLog.e0a1f54d.async.js +1 -0
- package/static/dist/src__pages__setting__notification.2ffe4e5a.async.js +1 -0
- package/static/dist/src__pages__setting__other.3d0b8492.async.js +1 -0
- package/static/dist/{src__pages__setting__progress.8823ac90.async.js → src__pages__setting__progress.2ccae3d7.async.js} +1 -1
- package/static/dist/src__pages__setting__security.e2d71ebb.async.js +1 -0
- package/static/dist/src__pages__setting__systemLog.b3046955.async.js +1 -0
- package/static/dist/src__pages__subscription__index.43086a06.async.js +1 -0
- package/static/dist/src__pages__subscription__logModal.cdba5139.async.js +1 -0
- package/static/dist/src__pages__subscription__modal.38991e1e.async.js +1 -0
- package/static/dist/{umi.ca04a019.js → umi.fc019050.js} +1 -1
- package/test/back/auth-security.test.cjs +74 -0
- package/test/back/build-provenance.test.cjs +150 -0
- package/test/back/cron-log-name.test.cjs +110 -0
- package/test/back/cron-validation.test.cjs +45 -0
- package/test/back/dashboard-failures.test.cjs +173 -0
- package/test/back/database-bootstrap.test.cjs +193 -0
- package/test/back/dependence-cache-status.test.cjs +125 -0
- package/test/back/deprecated-file-routes.test.cjs +82 -0
- package/test/back/ecosystem.test.cjs +28 -0
- package/test/back/env-name-parsing.test.cjs +96 -0
- package/test/back/execution-lifecycle.test.cjs +236 -0
- package/test/back/file-access-security.test.cjs +47 -0
- package/test/back/fileTreeListing.test.cjs +57 -0
- package/test/back/grpc-cron-response.test.cjs +60 -0
- package/test/back/http-exclusive-listen.test.cjs +31 -0
- package/test/back/http-security.test.cjs +213 -0
- package/test/back/listen-security.test.cjs +67 -0
- package/test/back/log-path-security.test.cjs +158 -0
- package/test/back/logReader.test.cjs +72 -0
- package/test/back/manual-execution.test.cjs +85 -0
- package/test/back/manual-stop-claim.test.cjs +220 -0
- package/test/back/metrics.test.cjs +34 -0
- package/test/back/monitoring.test.cjs +73 -0
- package/test/back/node-path-cache.test.cjs +173 -0
- package/test/back/node-path-lock.test.cjs +178 -0
- package/test/back/npm-publication.test.cjs +70 -0
- package/test/back/primary-apm.test.cjs +24 -0
- package/test/back/process-exit-state.test.cjs +81 -0
- package/test/back/process-stop-signal.test.cjs +77 -0
- package/test/back/protected-path-case.test.cjs +58 -0
- package/test/back/qlServiceLogCommand.test.cjs +128 -0
- package/test/back/retention.test.cjs +131 -0
- package/test/back/role-loading.test.cjs +118 -0
- package/test/back/schedule-health.test.cjs +86 -0
- package/test/back/scheduler-file-lock.test.cjs +51 -0
- package/test/back/scheduler-mutation.test.cjs +312 -0
- package/test/back/scheduler-readiness.test.cjs +85 -0
- package/test/back/scheduler-reconciliation.test.cjs +152 -0
- package/test/back/scheduler-rpc-timeout.test.cjs +49 -0
- package/test/back/schema-migrations.test.cjs +127 -0
- package/test/back/shell-api-parsing.test.cjs +184 -0
- package/test/back/sock-polling.test.cjs +297 -0
- package/test/back/sock-security.test.cjs +72 -0
- package/test/back/start-env-preservation.test.cjs +53 -0
- package/test/back/stop-failure-feedback.test.cjs +158 -0
- package/test/back/stop-race.test.cjs +167 -0
- package/test/back/subscription-cleanup.test.cjs +53 -0
- package/test/back/subscription-stop-state.test.cjs +66 -0
- package/test/back/system-dependence-cache.test.cjs +126 -0
- package/test/back/task-time.test.cjs +116 -0
- package/test/back/user-api.test.cjs +99 -0
- package/test/back/user-security.test.cjs +248 -0
- package/test/back/worker-apm.test.cjs +84 -0
- package/test/back/wpush-grpc.test.cjs +115 -0
- package/test/front/cron-log-pagination.test.cjs +214 -0
- package/test/front/http-auth.test.cjs +152 -0
- package/test/front/http-error.test.cjs +29 -0
- package/test/helpers/load-security-module.cjs +42 -0
- package/version.yaml +19 -34
- package/CLAUDE.md +0 -43
- package/static/dist/1147.c420132e.async.js +0 -1
- package/static/dist/134.54df9e38.async.js +0 -1
- package/static/dist/2208.f7ba3dfa.async.js +0 -1
- package/static/dist/2286.164bb089.async.js +0 -1
- package/static/dist/3191.63263871.async.js +0 -1
- package/static/dist/4902.555f92ab.async.js +0 -1
- package/static/dist/5520.ff2cfd6b.async.js +0 -1
- package/static/dist/6431.c50479be.async.js +0 -1
- package/static/dist/8826.2447a104.async.js +0 -1
- package/static/dist/layouts__index.a7a2bfe0.async.js +0 -1
- package/static/dist/preload_helper.0431c0f3.js +0 -1
- package/static/dist/src__pages__crontab__detail.b9c36808.async.js +0 -1
- package/static/dist/src__pages__crontab__index.fed99fd0.async.js +0 -1
- package/static/dist/src__pages__crontab__modal.f7041c7c.async.js +0 -1
- package/static/dist/src__pages__crontab__viewCreateModal.4d589f66.async.js +0 -1
- package/static/dist/src__pages__crontab__viewManageModal.0e317746.async.js +0 -1
- package/static/dist/src__pages__dashboard__index.b30f2f47.async.js +0 -1
- package/static/dist/src__pages__dependence__index.3d87ceac.async.js +0 -1
- package/static/dist/src__pages__dependence__logModal.0681830b.async.js +0 -1
- package/static/dist/src__pages__dependence__modal.11124896.async.js +0 -1
- package/static/dist/src__pages__env__editNameModal.5d264b25.async.js +0 -1
- package/static/dist/src__pages__env__index.baa27d4e.async.js +0 -1
- package/static/dist/src__pages__env__modal.7f2ef1bc.async.js +0 -1
- package/static/dist/src__pages__error__index.f156b45e.async.js +0 -1
- package/static/dist/src__pages__initialization__index.e96d4ba8.async.js +0 -1
- package/static/dist/src__pages__log__index.e0978bae.async.js +0 -1
- package/static/dist/src__pages__script__editModal.cbf4ec0e.async.js +0 -1
- package/static/dist/src__pages__script__editNameModal.3e7e100d.async.js +0 -1
- package/static/dist/src__pages__script__index.2765d1b8.async.js +0 -1
- package/static/dist/src__pages__script__renameModal.5e987ef5.async.js +0 -1
- package/static/dist/src__pages__script__saveModal.3f9d23d6.async.js +0 -1
- package/static/dist/src__pages__script__setting.a535793a.async.js +0 -1
- package/static/dist/src__pages__setting__appModal.251cd14f.async.js +0 -1
- package/static/dist/src__pages__setting__checkUpdate.46efe057.async.js +0 -1
- package/static/dist/src__pages__setting__dependence.8a7a9529.async.js +0 -1
- package/static/dist/src__pages__setting__index.cc85fdfb.async.js +0 -1
- package/static/dist/src__pages__setting__loginLog.cea6056c.async.js +0 -1
- package/static/dist/src__pages__setting__notification.390fc905.async.js +0 -1
- package/static/dist/src__pages__setting__other.b22d2165.async.js +0 -1
- package/static/dist/src__pages__setting__security.598720a8.async.js +0 -1
- package/static/dist/src__pages__setting__systemLog.67406721.async.js +0 -1
- package/static/dist/src__pages__subscription__index.d0ab2abc.async.js +0 -1
- package/static/dist/src__pages__subscription__logModal.3864b37f.async.js +0 -1
- package/static/dist/src__pages__subscription__modal.3562c670.async.js +0 -1
package/static/build/api/user.js
CHANGED
|
@@ -25,7 +25,25 @@ const storage = multer_1.default.diskStorage({
|
|
|
25
25
|
cb(null, key + ext);
|
|
26
26
|
},
|
|
27
27
|
});
|
|
28
|
-
const upload = (0, multer_1.default)({
|
|
28
|
+
const upload = (0, multer_1.default)({
|
|
29
|
+
storage,
|
|
30
|
+
limits: { fileSize: 5 * 1024 * 1024, files: 1 },
|
|
31
|
+
fileFilter: (_req, file, cb) => {
|
|
32
|
+
const ext = path_1.default.extname(file.originalname).toLowerCase();
|
|
33
|
+
const imageTypes = {
|
|
34
|
+
'.png': 'image/png',
|
|
35
|
+
'.jpg': 'image/jpeg',
|
|
36
|
+
'.jpeg': 'image/jpeg',
|
|
37
|
+
'.gif': 'image/gif',
|
|
38
|
+
'.webp': 'image/webp',
|
|
39
|
+
'.avif': 'image/avif',
|
|
40
|
+
};
|
|
41
|
+
if (imageTypes[ext] !== file.mimetype) {
|
|
42
|
+
return cb(new Error((0, i18n_1.t)('仅支持 PNG、JPEG、GIF、WebP、AVIF 图片')));
|
|
43
|
+
}
|
|
44
|
+
cb(null, true);
|
|
45
|
+
},
|
|
46
|
+
});
|
|
29
47
|
exports.default = (app) => {
|
|
30
48
|
app.use('/user', route);
|
|
31
49
|
route.post('/login', (0, express_rate_limit_1.default)({
|
|
@@ -33,8 +51,8 @@ exports.default = (app) => {
|
|
|
33
51
|
max: 100,
|
|
34
52
|
}), (0, celebrate_1.celebrate)({
|
|
35
53
|
body: celebrate_1.Joi.object({
|
|
36
|
-
username: celebrate_1.Joi.string().required(),
|
|
37
|
-
password: celebrate_1.Joi.string().required(),
|
|
54
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
55
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
38
56
|
}),
|
|
39
57
|
}), async (req, res, next) => {
|
|
40
58
|
const logger = typedi_1.Container.get('logger');
|
|
@@ -61,8 +79,8 @@ exports.default = (app) => {
|
|
|
61
79
|
});
|
|
62
80
|
route.put('/', (0, celebrate_1.celebrate)({
|
|
63
81
|
body: celebrate_1.Joi.object({
|
|
64
|
-
username: celebrate_1.Joi.string().required(),
|
|
65
|
-
password: celebrate_1.Joi.string().required(),
|
|
82
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
83
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
66
84
|
}),
|
|
67
85
|
}), async (req, res, next) => {
|
|
68
86
|
try {
|
|
@@ -70,8 +88,8 @@ exports.default = (app) => {
|
|
|
70
88
|
return res.send({ code: 450, message: (0, i18n_1.t)('未知错误') });
|
|
71
89
|
}
|
|
72
90
|
const userService = typedi_1.Container.get(user_1.default);
|
|
73
|
-
await userService.updateUsernameAndPassword(req.body);
|
|
74
|
-
res.send(
|
|
91
|
+
const result = await userService.updateUsernameAndPassword(req.body);
|
|
92
|
+
res.send(result);
|
|
75
93
|
}
|
|
76
94
|
catch (e) {
|
|
77
95
|
return next(e);
|
|
@@ -133,11 +151,11 @@ exports.default = (app) => {
|
|
|
133
151
|
return next(e);
|
|
134
152
|
}
|
|
135
153
|
});
|
|
136
|
-
route.put('/two-factor/login', (0, celebrate_1.celebrate)({
|
|
154
|
+
route.put('/two-factor/login', (0, express_rate_limit_1.default)({ windowMs: 15 * 60 * 1000, max: 20 }), (0, celebrate_1.celebrate)({
|
|
137
155
|
body: celebrate_1.Joi.object({
|
|
138
156
|
code: celebrate_1.Joi.string().required(),
|
|
139
|
-
username: celebrate_1.Joi.string().required(),
|
|
140
|
-
password: celebrate_1.Joi.string().required(),
|
|
157
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
158
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
141
159
|
}),
|
|
142
160
|
}), async (req, res, next) => {
|
|
143
161
|
const logger = typedi_1.Container.get('logger');
|
|
@@ -161,6 +179,48 @@ exports.default = (app) => {
|
|
|
161
179
|
return next(e);
|
|
162
180
|
}
|
|
163
181
|
});
|
|
182
|
+
route.get('/ip-blacklist', async (req, res, next) => {
|
|
183
|
+
try {
|
|
184
|
+
const userService = typedi_1.Container.get(user_1.default);
|
|
185
|
+
const data = await userService.getIpBlacklist();
|
|
186
|
+
res.send({ code: 200, data });
|
|
187
|
+
}
|
|
188
|
+
catch (e) {
|
|
189
|
+
return next(e);
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
route.put('/ip-blacklist', (0, celebrate_1.celebrate)({
|
|
193
|
+
body: celebrate_1.Joi.object({
|
|
194
|
+
ip: celebrate_1.Joi.string()
|
|
195
|
+
.ip({ version: ['ipv4', 'ipv6'], cidr: 'forbidden' })
|
|
196
|
+
.required(),
|
|
197
|
+
}),
|
|
198
|
+
}), async (req, res, next) => {
|
|
199
|
+
try {
|
|
200
|
+
const userService = typedi_1.Container.get(user_1.default);
|
|
201
|
+
const data = await userService.blockIp(req.body.ip);
|
|
202
|
+
res.send({ code: 200, data, message: (0, i18n_1.t)('已加入 IP 黑名单') });
|
|
203
|
+
}
|
|
204
|
+
catch (e) {
|
|
205
|
+
return next(e);
|
|
206
|
+
}
|
|
207
|
+
});
|
|
208
|
+
route.delete('/ip-blacklist', (0, celebrate_1.celebrate)({
|
|
209
|
+
body: celebrate_1.Joi.object({
|
|
210
|
+
ip: celebrate_1.Joi.string()
|
|
211
|
+
.ip({ version: ['ipv4', 'ipv6'], cidr: 'forbidden' })
|
|
212
|
+
.required(),
|
|
213
|
+
}),
|
|
214
|
+
}), async (req, res, next) => {
|
|
215
|
+
try {
|
|
216
|
+
const userService = typedi_1.Container.get(user_1.default);
|
|
217
|
+
const data = await userService.unblockIp(req.body.ip);
|
|
218
|
+
res.send({ code: 200, data, message: (0, i18n_1.t)('已移出 IP 黑名单') });
|
|
219
|
+
}
|
|
220
|
+
catch (e) {
|
|
221
|
+
return next(e);
|
|
222
|
+
}
|
|
223
|
+
});
|
|
164
224
|
route.get('/notification', async (req, res, next) => {
|
|
165
225
|
const logger = typedi_1.Container.get('logger');
|
|
166
226
|
try {
|
|
@@ -183,17 +243,17 @@ exports.default = (app) => {
|
|
|
183
243
|
return next(e);
|
|
184
244
|
}
|
|
185
245
|
});
|
|
186
|
-
route.put('/init', (0, celebrate_1.celebrate)({
|
|
246
|
+
route.put('/init', (0, express_rate_limit_1.default)({ windowMs: 15 * 60 * 1000, max: 20 }), (0, celebrate_1.celebrate)({
|
|
187
247
|
body: celebrate_1.Joi.object({
|
|
188
|
-
username: celebrate_1.Joi.string().required(),
|
|
189
|
-
password: celebrate_1.Joi.string().required(),
|
|
248
|
+
username: celebrate_1.Joi.string().max(1024).required(),
|
|
249
|
+
password: celebrate_1.Joi.string().max(1024).required(),
|
|
190
250
|
}),
|
|
191
251
|
}), async (req, res, next) => {
|
|
192
252
|
const logger = typedi_1.Container.get('logger');
|
|
193
253
|
try {
|
|
194
254
|
const userService = typedi_1.Container.get(user_1.default);
|
|
195
|
-
await userService.
|
|
196
|
-
res.send(
|
|
255
|
+
const result = await userService.initializeUser(req.body);
|
|
256
|
+
res.send(result);
|
|
197
257
|
}
|
|
198
258
|
catch (e) {
|
|
199
259
|
return next(e);
|
package/static/build/app.js
CHANGED
|
@@ -28,26 +28,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
require("reflect-metadata");
|
|
30
30
|
const cluster_1 = __importDefault(require("cluster"));
|
|
31
|
-
const compression_1 = __importDefault(require("compression"));
|
|
32
|
-
const cors_1 = __importDefault(require("cors"));
|
|
33
|
-
const express_1 = __importDefault(require("express"));
|
|
34
|
-
const helmet_1 = __importDefault(require("helmet"));
|
|
35
31
|
const typedi_1 = require("typedi");
|
|
36
32
|
const config_1 = __importDefault(require("./config"));
|
|
37
33
|
const logger_1 = __importDefault(require("./loaders/logger"));
|
|
38
|
-
const
|
|
34
|
+
const errors_1 = require("./shared/errors");
|
|
39
35
|
class Application {
|
|
40
36
|
constructor() {
|
|
41
37
|
this.isShuttingDown = false;
|
|
42
38
|
this.workerMetadataMap = new Map();
|
|
43
|
-
this.app = (0, express_1.default)();
|
|
44
|
-
// 创建一个全局中间件,删除查询参数中的t
|
|
45
|
-
this.app.use((req, res, next) => {
|
|
46
|
-
if (req.query.t) {
|
|
47
|
-
delete req.query.t;
|
|
48
|
-
}
|
|
49
|
-
next();
|
|
50
|
-
});
|
|
51
39
|
}
|
|
52
40
|
async start() {
|
|
53
41
|
try {
|
|
@@ -62,7 +50,7 @@ class Application {
|
|
|
62
50
|
}
|
|
63
51
|
}
|
|
64
52
|
catch (error) {
|
|
65
|
-
logger_1.default.error(
|
|
53
|
+
logger_1.default.error(`Failed to start application:\n${(0, errors_1.errStack)(error)}`);
|
|
66
54
|
process.exit(1);
|
|
67
55
|
}
|
|
68
56
|
}
|
|
@@ -72,37 +60,44 @@ class Application {
|
|
|
72
60
|
// Wait for gRPC worker to signal it's ready before starting HTTP worker
|
|
73
61
|
this.waitForWorkerReady(grpcWorker, 30000)
|
|
74
62
|
.then(() => {
|
|
75
|
-
logger_1.default.info('
|
|
63
|
+
logger_1.default.info('[boot] gRPC worker is ready, starting HTTP worker');
|
|
76
64
|
this.httpWorker = this.forkWorker('http');
|
|
77
65
|
})
|
|
78
66
|
.catch((error) => {
|
|
79
|
-
logger_1.default.error(
|
|
67
|
+
logger_1.default.error(`[boot] Failed to wait for gRPC worker:\n${(0, errors_1.errStack)(error)}`);
|
|
80
68
|
process.exit(1);
|
|
81
69
|
});
|
|
82
70
|
cluster_1.default.on('exit', (worker, code, signal) => {
|
|
71
|
+
var _a;
|
|
83
72
|
const metadata = this.workerMetadataMap.get(worker.id);
|
|
84
73
|
if (metadata) {
|
|
85
74
|
if (!this.isShuttingDown) {
|
|
86
|
-
logger_1.default.error(
|
|
75
|
+
logger_1.default.error(`${metadata.serviceType} worker ${worker.process.pid} died (${signal || code}). Restarting...`);
|
|
87
76
|
// If gRPC worker died, restart it and wait for it to be ready
|
|
88
77
|
if (metadata.serviceType === 'grpc') {
|
|
78
|
+
try {
|
|
79
|
+
(_a = this.httpWorker) === null || _a === void 0 ? void 0 : _a.send('scheduler-unavailable');
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
logger_1.default.warn('Unable to notify HTTP worker of scheduler exit');
|
|
83
|
+
}
|
|
89
84
|
const newGrpcWorker = this.forkWorker('grpc');
|
|
90
85
|
this.waitForWorkerReady(newGrpcWorker, 30000)
|
|
91
86
|
.then(() => {
|
|
92
|
-
logger_1.default.info('
|
|
87
|
+
logger_1.default.info('gRPC worker restarted and ready');
|
|
93
88
|
// Re-register cron jobs by notifying the HTTP worker
|
|
94
89
|
if (this.httpWorker) {
|
|
95
90
|
try {
|
|
96
91
|
this.httpWorker.send('reregister-crons');
|
|
97
|
-
logger_1.default.info('
|
|
92
|
+
logger_1.default.info('Sent reregister-crons message to HTTP worker');
|
|
98
93
|
}
|
|
99
94
|
catch (error) {
|
|
100
|
-
logger_1.default.error(
|
|
95
|
+
logger_1.default.error(`Failed to send reregister-crons message:\n${(0, errors_1.errStack)(error)}`);
|
|
101
96
|
}
|
|
102
97
|
}
|
|
103
98
|
})
|
|
104
99
|
.catch((error) => {
|
|
105
|
-
logger_1.default.error(
|
|
100
|
+
logger_1.default.error(`Failed to restart gRPC worker:\n${(0, errors_1.errStack)(error)}`);
|
|
106
101
|
process.exit(1);
|
|
107
102
|
});
|
|
108
103
|
}
|
|
@@ -110,7 +105,7 @@ class Application {
|
|
|
110
105
|
// For HTTP worker, just restart it
|
|
111
106
|
const newWorker = this.forkWorker(metadata.serviceType);
|
|
112
107
|
this.httpWorker = newWorker;
|
|
113
|
-
logger_1.default.info(
|
|
108
|
+
logger_1.default.info(`Restarted ${metadata.serviceType} worker (PID: ${newWorker.process.pid})`);
|
|
114
109
|
}
|
|
115
110
|
}
|
|
116
111
|
this.workerMetadataMap.delete(worker.id);
|
|
@@ -136,7 +131,14 @@ class Application {
|
|
|
136
131
|
});
|
|
137
132
|
}
|
|
138
133
|
forkWorker(serviceType) {
|
|
139
|
-
const
|
|
134
|
+
const workerEnv = { SERVICE_TYPE: serviceType };
|
|
135
|
+
// PM2's fork launcher is inherited by our own cluster workers. Their APM
|
|
136
|
+
// messages go to this primary, not PM2, and duplicate its sampling work.
|
|
137
|
+
// Keep primary monitoring and allow restoring the inherited worker APM.
|
|
138
|
+
if (process.env.pm_id !== undefined && process.env.QL_WORKER_APM !== 'true') {
|
|
139
|
+
workerEnv.pmx = 'false';
|
|
140
|
+
}
|
|
141
|
+
const worker = cluster_1.default.fork(workerEnv);
|
|
140
142
|
this.workerMetadataMap.set(worker.id, {
|
|
141
143
|
id: worker.id,
|
|
142
144
|
pid: worker.process.pid,
|
|
@@ -146,16 +148,31 @@ class Application {
|
|
|
146
148
|
return worker;
|
|
147
149
|
}
|
|
148
150
|
async initializeDatabase() {
|
|
149
|
-
const
|
|
150
|
-
await
|
|
151
|
+
const { runStartupProcess } = await Promise.resolve().then(() => __importStar(require('./shared/startupProcess')));
|
|
152
|
+
await runStartupProcess(require.resolve('./bootstrap/database'));
|
|
151
153
|
}
|
|
152
|
-
setupMiddlewares() {
|
|
153
|
-
|
|
154
|
+
async setupMiddlewares() {
|
|
155
|
+
// Only the HTTP worker needs an Express application and its middleware.
|
|
156
|
+
const [{ default: createExpress }, { default: helmet }, { default: cors }, { default: compression }, { monitoringMiddleware },] = await Promise.all([
|
|
157
|
+
Promise.resolve().then(() => __importStar(require('express'))),
|
|
158
|
+
Promise.resolve().then(() => __importStar(require('helmet'))),
|
|
159
|
+
Promise.resolve().then(() => __importStar(require('cors'))),
|
|
160
|
+
Promise.resolve().then(() => __importStar(require('compression'))),
|
|
161
|
+
Promise.resolve().then(() => __importStar(require('./middlewares/monitoring'))),
|
|
162
|
+
]);
|
|
163
|
+
const app = createExpress();
|
|
164
|
+
app.use((req, res, next) => {
|
|
165
|
+
if (req.query.t)
|
|
166
|
+
delete req.query.t;
|
|
167
|
+
next();
|
|
168
|
+
});
|
|
169
|
+
app.use(helmet({
|
|
154
170
|
contentSecurityPolicy: false,
|
|
155
171
|
}));
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
172
|
+
app.use(cors(config_1.default.cors));
|
|
173
|
+
app.use(compression());
|
|
174
|
+
app.use(monitoringMiddleware);
|
|
175
|
+
return app;
|
|
159
176
|
}
|
|
160
177
|
setupMasterShutdown() {
|
|
161
178
|
const shutdown = async () => {
|
|
@@ -168,14 +185,14 @@ class Application {
|
|
|
168
185
|
if (worker) {
|
|
169
186
|
const exitPromise = new Promise((resolve) => {
|
|
170
187
|
worker.once('exit', () => {
|
|
171
|
-
logger_1.default.info(
|
|
188
|
+
logger_1.default.info(`Worker ${worker.process.pid} exited`);
|
|
172
189
|
resolve();
|
|
173
190
|
});
|
|
174
191
|
try {
|
|
175
192
|
worker.send('shutdown');
|
|
176
193
|
}
|
|
177
194
|
catch (error) {
|
|
178
|
-
logger_1.default.warn(
|
|
195
|
+
logger_1.default.warn(`Failed to send shutdown to worker ${worker.process.pid}:\n${(0, errors_1.errStack)(error)}`);
|
|
179
196
|
}
|
|
180
197
|
});
|
|
181
198
|
workerPromises.push(exitPromise);
|
|
@@ -186,7 +203,7 @@ class Application {
|
|
|
186
203
|
Promise.all(workerPromises),
|
|
187
204
|
new Promise((resolve) => {
|
|
188
205
|
setTimeout(() => {
|
|
189
|
-
logger_1.default.warn('
|
|
206
|
+
logger_1.default.warn('Worker shutdown timeout reached');
|
|
190
207
|
resolve();
|
|
191
208
|
}, 10000);
|
|
192
209
|
}),
|
|
@@ -194,7 +211,7 @@ class Application {
|
|
|
194
211
|
process.exit(0);
|
|
195
212
|
}
|
|
196
213
|
catch (error) {
|
|
197
|
-
logger_1.default.error(
|
|
214
|
+
logger_1.default.error(`Error during worker shutdown:\n${(0, errors_1.errStack)(error)}`);
|
|
198
215
|
process.exit(1);
|
|
199
216
|
}
|
|
200
217
|
};
|
|
@@ -205,10 +222,10 @@ class Application {
|
|
|
205
222
|
var _a;
|
|
206
223
|
const serviceType = process.env.SERVICE_TYPE;
|
|
207
224
|
if (!serviceType || !['http', 'grpc'].includes(serviceType)) {
|
|
208
|
-
logger_1.default.error('
|
|
225
|
+
logger_1.default.error('[boot] Invalid SERVICE_TYPE:', serviceType);
|
|
209
226
|
process.exit(1);
|
|
210
227
|
}
|
|
211
|
-
logger_1.default.info(
|
|
228
|
+
logger_1.default.info(`[boot] ${serviceType} worker started (PID: ${process.pid})`);
|
|
212
229
|
try {
|
|
213
230
|
if (serviceType === 'http') {
|
|
214
231
|
await this.startHttpService();
|
|
@@ -219,7 +236,7 @@ class Application {
|
|
|
219
236
|
(_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
|
|
220
237
|
}
|
|
221
238
|
catch (error) {
|
|
222
|
-
logger_1.default.error(
|
|
239
|
+
logger_1.default.error(`[boot] ${serviceType} worker failed:\n${(0, errors_1.errStack)(error)}`);
|
|
223
240
|
process.exit(1);
|
|
224
241
|
}
|
|
225
242
|
}
|
|
@@ -227,12 +244,12 @@ class Application {
|
|
|
227
244
|
// 在导入任何 gRPC 客户端模块之前初始化 mTLS 证书
|
|
228
245
|
const { initGrpcCerts } = await Promise.resolve().then(() => __importStar(require('./config/grpcCerts')));
|
|
229
246
|
await initGrpcCerts();
|
|
230
|
-
this.setupMiddlewares();
|
|
247
|
+
const app = await this.setupMiddlewares();
|
|
231
248
|
const { HttpServerService } = await Promise.resolve().then(() => __importStar(require('./services/http')));
|
|
232
249
|
this.httpServerService = typedi_1.Container.get(HttpServerService);
|
|
233
250
|
const appLoader = await Promise.resolve().then(() => __importStar(require('./loaders/app')));
|
|
234
|
-
await appLoader.default({ app
|
|
235
|
-
const server = await this.httpServerService.initialize(
|
|
251
|
+
await appLoader.default({ app });
|
|
252
|
+
const server = await this.httpServerService.initialize(app, config_1.default.port);
|
|
236
253
|
const serverLoader = await Promise.resolve().then(() => __importStar(require('./loaders/server')));
|
|
237
254
|
await serverLoader.default({ server });
|
|
238
255
|
this.setupWorkerShutdown('http');
|
|
@@ -248,18 +265,10 @@ class Application {
|
|
|
248
265
|
if (msg === 'shutdown') {
|
|
249
266
|
this.gracefulShutdown(serviceType);
|
|
250
267
|
}
|
|
251
|
-
else if (
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
const CronService = (await Promise.resolve().then(() => __importStar(require('./services/cron')))).default;
|
|
256
|
-
const cronService = typedi_1.Container.get(CronService);
|
|
257
|
-
await cronService.autosave_crontab();
|
|
258
|
-
logger_1.default.info('✌️ Cron jobs re-registered successfully');
|
|
259
|
-
}
|
|
260
|
-
catch (error) {
|
|
261
|
-
logger_1.default.error('✌️ Failed to re-register cron jobs:', error);
|
|
262
|
-
}
|
|
268
|
+
else if (serviceType === 'http' &&
|
|
269
|
+
(msg === 'reregister-crons' || msg === 'scheduler-unavailable')) {
|
|
270
|
+
const { default: cronClient } = await Promise.resolve().then(() => __importStar(require('./schedule/client')));
|
|
271
|
+
cronClient.readiness.invalidate();
|
|
263
272
|
}
|
|
264
273
|
});
|
|
265
274
|
const shutdown = () => this.gracefulShutdown(serviceType);
|
|
@@ -281,14 +290,14 @@ class Application {
|
|
|
281
290
|
process.exit(0);
|
|
282
291
|
}
|
|
283
292
|
catch (error) {
|
|
284
|
-
logger_1.default.error(
|
|
293
|
+
logger_1.default.error(`[${serviceType}] Error during shutdown:\n${(0, errors_1.errStack)(error)}`);
|
|
285
294
|
process.exit(1);
|
|
286
295
|
}
|
|
287
296
|
}
|
|
288
297
|
}
|
|
289
298
|
const app = new Application();
|
|
290
299
|
app.start().catch((error) => {
|
|
291
|
-
logger_1.default.error(
|
|
300
|
+
logger_1.default.error(`🙅♀️ Application failed to start:\n${(0, errors_1.errStack)(error)}`);
|
|
292
301
|
process.exit(1);
|
|
293
302
|
});
|
|
294
303
|
//# sourceMappingURL=app.js.map
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const errors_1 = require("../shared/errors");
|
|
27
|
+
// Also terminate if the primary disappears without forwarding a signal.
|
|
28
|
+
const onParentDisconnect = () => process.exit(1);
|
|
29
|
+
process.once('disconnect', onParentDisconnect);
|
|
30
|
+
async function initializeDatabase() {
|
|
31
|
+
const { sequelize } = await Promise.resolve().then(() => __importStar(require('../data')));
|
|
32
|
+
try {
|
|
33
|
+
const { default: loadDatabase } = await Promise.resolve().then(() => __importStar(require('../loaders/db')));
|
|
34
|
+
await loadDatabase();
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
await sequelize.close();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
initializeDatabase()
|
|
41
|
+
.catch((error) => {
|
|
42
|
+
console.error(`[boot] Database initialization failed:\n${(0, errors_1.errStack)(error)}`);
|
|
43
|
+
process.exitCode = 1;
|
|
44
|
+
})
|
|
45
|
+
.finally(() => {
|
|
46
|
+
process.removeListener('disconnect', onParentDisconnect);
|
|
47
|
+
// Let pending log writes drain and exit naturally after closing SQLite.
|
|
48
|
+
if (process.connected)
|
|
49
|
+
process.disconnect();
|
|
50
|
+
});
|
|
51
|
+
//# sourceMappingURL=database.js.map
|
|
@@ -52,7 +52,7 @@ async function tmpFile(prefix) {
|
|
|
52
52
|
return path_1.default.join(dir, `.${prefix}_${Date.now()}_${Math.random().toString(36).slice(2)}.pem`);
|
|
53
53
|
}
|
|
54
54
|
async function generateAllCerts() {
|
|
55
|
-
logger_1.default.info('Generating gRPC mTLS certificates...');
|
|
55
|
+
logger_1.default.info('[boot] Generating gRPC mTLS certificates...');
|
|
56
56
|
const caKeyTmp = await tmpFile('ca_key');
|
|
57
57
|
const caCertTmp = await tmpFile('ca_cert');
|
|
58
58
|
const serverKeyTmp = await tmpFile('server_key');
|
|
@@ -92,7 +92,7 @@ async function generateAllCerts() {
|
|
|
92
92
|
const clientCert = run(`openssl x509 -req -days 3650 -in '${clientCsrTmp}' -CA '${caCertTmp}' -CAkey '${caKeyTmp}' -CAcreateserial -extfile '${clientExtTmp}' 2>/dev/null`);
|
|
93
93
|
const clientKey = await fs.readFile(clientKeyTmp, 'utf-8');
|
|
94
94
|
await cleanup();
|
|
95
|
-
logger_1.default.info('gRPC mTLS certificates generated successfully');
|
|
95
|
+
logger_1.default.info('[boot] gRPC mTLS certificates generated successfully');
|
|
96
96
|
return { caCert, serverCert, serverKey, clientCert, clientKey };
|
|
97
97
|
}
|
|
98
98
|
catch (e) {
|
|
@@ -107,7 +107,7 @@ async function saveCerts(tlsConfig) {
|
|
|
107
107
|
await fs.writeFile(serverKeyPath, tlsConfig.serverKey, { mode: 0o600 });
|
|
108
108
|
await fs.writeFile(clientCertPath, tlsConfig.clientCert, { mode: 0o644 });
|
|
109
109
|
await fs.writeFile(clientKeyPath, tlsConfig.clientKey, { mode: 0o600 });
|
|
110
|
-
logger_1.default.info(`gRPC mTLS certificates saved to ${certDir}`);
|
|
110
|
+
logger_1.default.info(`[boot] gRPC mTLS certificates saved to ${certDir}`);
|
|
111
111
|
}
|
|
112
112
|
async function loadExistingCerts() {
|
|
113
113
|
const exists = await Promise.all([
|
|
@@ -127,7 +127,7 @@ async function loadExistingCerts() {
|
|
|
127
127
|
fs.readFile(clientCertPath, 'utf-8'),
|
|
128
128
|
fs.readFile(clientKeyPath, 'utf-8'),
|
|
129
129
|
]);
|
|
130
|
-
logger_1.default.info('Loaded existing gRPC mTLS certificates from disk');
|
|
130
|
+
logger_1.default.info('[boot] Loaded existing gRPC mTLS certificates from disk');
|
|
131
131
|
return { caCert, serverCert, serverKey, clientCert, clientKey };
|
|
132
132
|
}
|
|
133
133
|
async function initGrpcCerts() {
|
|
@@ -87,8 +87,6 @@ const extraFile = path_1.default.join(configPath, 'extra.sh');
|
|
|
87
87
|
const confBakDir = path_1.default.join(dataPath, 'config/bak/');
|
|
88
88
|
const sampleFile = path_1.default.join(samplePath, 'config.sample.sh');
|
|
89
89
|
const sqliteFile = path_1.default.join(samplePath, 'database.sqlite');
|
|
90
|
-
const authError = '错误的用户名密码,请重试';
|
|
91
|
-
const loginFaild = '请先登录!';
|
|
92
90
|
const configString = 'config sample crontab shareCode diy';
|
|
93
91
|
const versionFile = path_1.default.join(rootPath, 'version.yaml');
|
|
94
92
|
const dataTgzFile = path_1.default.join(tmpPath, 'data.tgz');
|
|
@@ -105,8 +103,6 @@ exports.default = Object.assign(Object.assign({}, config), { jwt: config.jwt, ba
|
|
|
105
103
|
shareShellFile,
|
|
106
104
|
dependenceProxyFile,
|
|
107
105
|
configString,
|
|
108
|
-
loginFaild,
|
|
109
|
-
authError,
|
|
110
106
|
logPath,
|
|
111
107
|
extraFile,
|
|
112
108
|
authConfigFile,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createRandomString = void 0;
|
|
4
|
+
const crypto_1 = require("crypto");
|
|
4
5
|
function createRandomString(min, max) {
|
|
5
6
|
const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
|
|
6
7
|
const english = [
|
|
@@ -66,16 +67,16 @@ function createRandomString(min, max) {
|
|
|
66
67
|
arr.push(getOne(english));
|
|
67
68
|
arr.push(getOne(ENGLISH));
|
|
68
69
|
arr.push(getOne(special));
|
|
69
|
-
const len = min +
|
|
70
|
+
const len = min + (0, crypto_1.randomInt)(max - min + 1);
|
|
70
71
|
for (let i = 4; i < len; i++) {
|
|
71
|
-
arr.push(config[
|
|
72
|
+
arr.push(config[(0, crypto_1.randomInt)(config.length)]);
|
|
72
73
|
}
|
|
73
74
|
const newArr = [];
|
|
74
75
|
for (let j = 0; j < len; j++) {
|
|
75
|
-
newArr.push(arr.splice(
|
|
76
|
+
newArr.push(arr.splice((0, crypto_1.randomInt)(arr.length), 1)[0]);
|
|
76
77
|
}
|
|
77
78
|
function getOne(arr) {
|
|
78
|
-
return arr[
|
|
79
|
+
return arr[(0, crypto_1.randomInt)(arr.length)];
|
|
79
80
|
}
|
|
80
81
|
return newArr.join('');
|
|
81
82
|
}
|