@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
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
const test = require('node:test');
|
|
2
|
+
const assert = require('node:assert/strict');
|
|
3
|
+
const fs = require('node:fs');
|
|
4
|
+
const os = require('node:os');
|
|
5
|
+
const path = require('node:path');
|
|
6
|
+
const { spawnSync } = require('node:child_process');
|
|
7
|
+
function extract(file, name) {
|
|
8
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
9
|
+
const start = text.indexOf(name + '() {');
|
|
10
|
+
assert.ok(start >= 0);
|
|
11
|
+
return text.slice(start, text.indexOf('\n}', start) + 2);
|
|
12
|
+
}
|
|
13
|
+
const source =
|
|
14
|
+
['handle_log_path', 'init_begin_time']
|
|
15
|
+
.map((n) => extract('shell/task.sh', n))
|
|
16
|
+
.join('\n') +
|
|
17
|
+
'\n' +
|
|
18
|
+
['format_time', 'format_log_time', 'format_timestamp', 'handle_task_end']
|
|
19
|
+
.map((n) => extract('shell/share.sh', n))
|
|
20
|
+
.join('\n');
|
|
21
|
+
function run(t, body) {
|
|
22
|
+
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'ql-task-time-'));
|
|
23
|
+
t.after(() => fs.rmSync(dir, { recursive: true, force: true }));
|
|
24
|
+
const result = spawnSync(
|
|
25
|
+
'/bin/bash',
|
|
26
|
+
[
|
|
27
|
+
'-ec',
|
|
28
|
+
source +
|
|
29
|
+
`
|
|
30
|
+
is_macos=0
|
|
31
|
+
mtime_format='%Y-%m-%d %H:%M:%S.%3N'
|
|
32
|
+
time_format='%Y-%m-%d %H:%M:%S'
|
|
33
|
+
ID=42; dir_log=/tmp; log_name=''; real_log_path=''; no_tee=''; real_time=''
|
|
34
|
+
make_dir() { :; }
|
|
35
|
+
t() { printf '%s\\n' "$*" >> "$TEST_DIR/messages"; }
|
|
36
|
+
update_cron() { printf '%s\\n' "$*" >> "$TEST_DIR/status"; }
|
|
37
|
+
record_cron_stat() { printf '%s\\n' "$*" >> "$TEST_DIR/stats"; }
|
|
38
|
+
date() {
|
|
39
|
+
printf '%s\\n' "$*" >> "$TEST_DIR/dates"
|
|
40
|
+
case "$1" in
|
|
41
|
+
'+%Y-%m-%d %H:%M:%S.%3N|%Y-%m-%d-%H-%M-%S-%3N') printf '%s\\n' '2026-09-12 23:59:59.999|2026-09-12-23-59-59-999';;
|
|
42
|
+
'+%Y-%m-%d %H:%M:%S|%s') printf '%s\\n' '2026-09-13 00:00:00|101';;
|
|
43
|
+
'-d') [[ "$3" == '+%s' ]] && echo 100;;
|
|
44
|
+
*) echo raw-time;;
|
|
45
|
+
esac
|
|
46
|
+
}
|
|
47
|
+
` +
|
|
48
|
+
body,
|
|
49
|
+
],
|
|
50
|
+
{ encoding: 'utf8', env: { ...process.env, TEST_DIR: dir } },
|
|
51
|
+
);
|
|
52
|
+
assert.equal(result.status, 0, result.stderr + result.stdout);
|
|
53
|
+
return {
|
|
54
|
+
dir,
|
|
55
|
+
text: (name) =>
|
|
56
|
+
fs.existsSync(path.join(dir, name))
|
|
57
|
+
? fs.readFileSync(path.join(dir, name), 'utf8')
|
|
58
|
+
: '',
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
test('Linux task timestamps share a snapshot and retain millisecond log names across midnight', (t) => {
|
|
62
|
+
const r = run(
|
|
63
|
+
t,
|
|
64
|
+
`handle_log_path 'folder/example.js'
|
|
65
|
+
init_begin_time
|
|
66
|
+
[[ "$log_path" == 'folder_example_42/2026-09-12-23-59-59-999.log' ]]
|
|
67
|
+
[[ "$time" == '2026-09-12 23:59:59.999' && "$begin_time" == '2026-09-12 23:59:59' && "$begin_timestamp" == 100 ]]
|
|
68
|
+
handle_task_end`,
|
|
69
|
+
);
|
|
70
|
+
assert.equal(r.text('dates').trim().split('\n').length, 3);
|
|
71
|
+
assert.match(r.text('stats'), /^42 0 1\n$/);
|
|
72
|
+
assert.match(r.text('messages'), /2026-09-13 00:00:00/);
|
|
73
|
+
});
|
|
74
|
+
test('explicit log paths and output mode remain intact', (t) => {
|
|
75
|
+
run(
|
|
76
|
+
t,
|
|
77
|
+
`real_log_path='custom/output.log'; real_time=true
|
|
78
|
+
handle_log_path 'folder/example.js'
|
|
79
|
+
[[ "$log_path" == 'custom/output.log' && "$cmd" == '' ]]`,
|
|
80
|
+
);
|
|
81
|
+
});
|
|
82
|
+
test('task failure keeps exit code and minimum one-second runtime', (t) => {
|
|
83
|
+
const r = run(
|
|
84
|
+
t,
|
|
85
|
+
`begin_timestamp=101; _task_exit_code=7; log_path=test.log
|
|
86
|
+
handle_task_end`,
|
|
87
|
+
);
|
|
88
|
+
assert.equal(r.text('stats'), '42 7 1\n');
|
|
89
|
+
assert.match(r.text('messages'), /失败/);
|
|
90
|
+
assert.match(r.text('status'), /101 1 7/);
|
|
91
|
+
});
|
|
92
|
+
test('manual stop retains stopped message and exit status reporting', (t) => {
|
|
93
|
+
const r = run(
|
|
94
|
+
t,
|
|
95
|
+
`begin_timestamp=99; _task_exit_code=1; log_path=test.log; MANUAL=true
|
|
96
|
+
handle_task_end`,
|
|
97
|
+
);
|
|
98
|
+
assert.equal(r.text('stats'), '42 1 2\n');
|
|
99
|
+
assert.match(r.text('messages'), /已停止/);
|
|
100
|
+
});
|
|
101
|
+
for (const mode of ['macos', 'custom'])
|
|
102
|
+
test(`${mode} keeps legacy time conversion helpers`, (t) => {
|
|
103
|
+
run(
|
|
104
|
+
t,
|
|
105
|
+
`
|
|
106
|
+
${mode === 'macos' ? 'is_macos=1' : 'mtime_format=custom; time_format=custom'}
|
|
107
|
+
format_log_time() { echo legacy-log; }
|
|
108
|
+
format_time() { echo legacy-time; }
|
|
109
|
+
format_timestamp() { echo 100; }
|
|
110
|
+
handle_log_path example.js
|
|
111
|
+
init_begin_time
|
|
112
|
+
[[ "$log_time" == legacy-log && "$begin_time" == legacy-time && "$begin_timestamp" == 100 ]]
|
|
113
|
+
handle_task_end
|
|
114
|
+
`,
|
|
115
|
+
);
|
|
116
|
+
});
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
const assert = require('node:assert/strict');
|
|
2
|
+
const test = require('node:test');
|
|
3
|
+
const express = require('express');
|
|
4
|
+
const { Container } = require('typedi');
|
|
5
|
+
|
|
6
|
+
test('initialization returns the username and password validation result', async (t) => {
|
|
7
|
+
const originalGet = Container.get;
|
|
8
|
+
const userServicePath = require.resolve('../../back/services/user');
|
|
9
|
+
const originalUserService = require.cache[userServicePath];
|
|
10
|
+
const i18nPath = require.resolve('../../back/shared/i18n');
|
|
11
|
+
const originalI18n = require.cache[i18nPath];
|
|
12
|
+
const utilPath = require.resolve('../../back/config/util');
|
|
13
|
+
const originalUtil = require.cache[utilPath];
|
|
14
|
+
const authPath = require.resolve('../../back/shared/auth');
|
|
15
|
+
const originalAuth = require.cache[authPath];
|
|
16
|
+
require.cache[userServicePath] = {
|
|
17
|
+
id: userServicePath,
|
|
18
|
+
filename: userServicePath,
|
|
19
|
+
loaded: true,
|
|
20
|
+
exports: { __esModule: true, default: class UserService {} },
|
|
21
|
+
children: [],
|
|
22
|
+
paths: [],
|
|
23
|
+
};
|
|
24
|
+
require.cache[utilPath] = {
|
|
25
|
+
id: utilPath,
|
|
26
|
+
filename: utilPath,
|
|
27
|
+
loaded: true,
|
|
28
|
+
exports: { getToken: () => '', isDemoEnv: () => false },
|
|
29
|
+
children: [],
|
|
30
|
+
paths: [],
|
|
31
|
+
};
|
|
32
|
+
require.cache[authPath] = {
|
|
33
|
+
id: authPath,
|
|
34
|
+
filename: authPath,
|
|
35
|
+
loaded: true,
|
|
36
|
+
exports: { isDefaultAuthInfo: () => false },
|
|
37
|
+
children: [],
|
|
38
|
+
paths: [],
|
|
39
|
+
};
|
|
40
|
+
require.cache[i18nPath] = {
|
|
41
|
+
id: i18nPath,
|
|
42
|
+
filename: i18nPath,
|
|
43
|
+
loaded: true,
|
|
44
|
+
exports: { t: (message) => message },
|
|
45
|
+
children: [],
|
|
46
|
+
paths: [],
|
|
47
|
+
};
|
|
48
|
+
Container.get = () => ({
|
|
49
|
+
initializeUser: async () => ({
|
|
50
|
+
code: 400,
|
|
51
|
+
message: 'password rejected',
|
|
52
|
+
}),
|
|
53
|
+
});
|
|
54
|
+
t.after(() => {
|
|
55
|
+
Container.get = originalGet;
|
|
56
|
+
if (originalUserService) {
|
|
57
|
+
require.cache[userServicePath] = originalUserService;
|
|
58
|
+
} else {
|
|
59
|
+
delete require.cache[userServicePath];
|
|
60
|
+
}
|
|
61
|
+
if (originalI18n) {
|
|
62
|
+
require.cache[i18nPath] = originalI18n;
|
|
63
|
+
} else {
|
|
64
|
+
delete require.cache[i18nPath];
|
|
65
|
+
}
|
|
66
|
+
if (originalUtil) {
|
|
67
|
+
require.cache[utilPath] = originalUtil;
|
|
68
|
+
} else {
|
|
69
|
+
delete require.cache[utilPath];
|
|
70
|
+
}
|
|
71
|
+
if (originalAuth) {
|
|
72
|
+
require.cache[authPath] = originalAuth;
|
|
73
|
+
} else {
|
|
74
|
+
delete require.cache[authPath];
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
const app = express.Router();
|
|
79
|
+
require('../../back/api/user').default(app);
|
|
80
|
+
const userRouter = app.stack.find((layer) => layer.name === 'router').handle;
|
|
81
|
+
const initRoute = userRouter.stack.find(
|
|
82
|
+
(layer) => layer.route?.path === '/init',
|
|
83
|
+
);
|
|
84
|
+
const handler = initRoute.route.stack.at(-1).handle;
|
|
85
|
+
let responseBody;
|
|
86
|
+
|
|
87
|
+
await handler(
|
|
88
|
+
{ body: { username: 'admin', password: 'admin' } },
|
|
89
|
+
{ send: (body) => (responseBody = body) },
|
|
90
|
+
(error) => {
|
|
91
|
+
throw error;
|
|
92
|
+
},
|
|
93
|
+
);
|
|
94
|
+
|
|
95
|
+
assert.deepEqual(responseBody, {
|
|
96
|
+
code: 400,
|
|
97
|
+
message: 'password rejected',
|
|
98
|
+
});
|
|
99
|
+
});
|
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
const assert = require('node:assert/strict');
|
|
2
|
+
const test = require('node:test');
|
|
3
|
+
const path = require('node:path');
|
|
4
|
+
const jwt = require('jsonwebtoken');
|
|
5
|
+
const { authenticator } = require('@otplib/preset-default');
|
|
6
|
+
const load = require('../helpers/load-security-module.cjs');
|
|
7
|
+
const { verifyPassword, isPasswordHash } = load(
|
|
8
|
+
path.join(__dirname, '../../back/shared/password.ts'),
|
|
9
|
+
);
|
|
10
|
+
const req = {
|
|
11
|
+
platform: 'desktop',
|
|
12
|
+
headers: {},
|
|
13
|
+
socket: { remoteAddress: '127.0.0.1' },
|
|
14
|
+
};
|
|
15
|
+
|
|
16
|
+
function fixture(initial) {
|
|
17
|
+
let auth = structuredClone(initial);
|
|
18
|
+
let closed = 0;
|
|
19
|
+
const model = {
|
|
20
|
+
findOne: async () => ({ id: 1 }),
|
|
21
|
+
update: async () => [1, [{}]],
|
|
22
|
+
create: async (x) => x,
|
|
23
|
+
findAll: async () => [],
|
|
24
|
+
destroy: async () => {},
|
|
25
|
+
};
|
|
26
|
+
const mocks = {
|
|
27
|
+
typedi: { Service: () => (x) => x, Inject: () => () => {} },
|
|
28
|
+
'../config': { jwt: { secret: 'test-secret' }, maxTokensPerPlatform: 10 },
|
|
29
|
+
'../data/system': {
|
|
30
|
+
AuthDataType: { authConfig: 'authConfig', loginLog: 'loginLog' },
|
|
31
|
+
LoginStatus: { fail: 0, success: 1 },
|
|
32
|
+
SystemModel: model,
|
|
33
|
+
},
|
|
34
|
+
'../config/util': {
|
|
35
|
+
createRandomString: () =>
|
|
36
|
+
require('node:crypto').randomBytes(32).toString('hex'),
|
|
37
|
+
},
|
|
38
|
+
'./notify': class {},
|
|
39
|
+
'./schedule': class {},
|
|
40
|
+
'./sock': class {},
|
|
41
|
+
'../shared/store': {
|
|
42
|
+
shareStore: {
|
|
43
|
+
getAuthInfo: async () => auth,
|
|
44
|
+
updateAuthInfo: async (x) => {
|
|
45
|
+
auth = x;
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
'../shared/i18n': { t: (x) => x, tf: (x, y) => x.replace('%s', y) },
|
|
50
|
+
'../shared/clientIp': {
|
|
51
|
+
getClientIp: () => '127.0.0.1',
|
|
52
|
+
normalizeClientIp: (x) => x,
|
|
53
|
+
},
|
|
54
|
+
ip2region: class {
|
|
55
|
+
search() {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
},
|
|
59
|
+
};
|
|
60
|
+
const User = load(
|
|
61
|
+
path.join(__dirname, '../../back/services/user.ts'),
|
|
62
|
+
mocks,
|
|
63
|
+
).default;
|
|
64
|
+
const user = new User(
|
|
65
|
+
{ warn() {}, info() {} },
|
|
66
|
+
{},
|
|
67
|
+
{ getClients: () => [{ close: () => closed++ }] },
|
|
68
|
+
);
|
|
69
|
+
user.notificationService = { notify() {} };
|
|
70
|
+
return {
|
|
71
|
+
user,
|
|
72
|
+
get auth() {
|
|
73
|
+
return auth;
|
|
74
|
+
},
|
|
75
|
+
get closed() {
|
|
76
|
+
return closed;
|
|
77
|
+
},
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
const initialized = () => ({
|
|
81
|
+
username: 'owner',
|
|
82
|
+
password: 'old-password',
|
|
83
|
+
token: 'stolen-token',
|
|
84
|
+
tokens: { desktop: [{ value: 'stolen-token' }] },
|
|
85
|
+
retries: 0,
|
|
86
|
+
lastlogon: 0,
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
test('initialization checks state inside a serialized mutation', async () => {
|
|
90
|
+
const f = fixture({ username: 'admin', password: 'admin' });
|
|
91
|
+
assert.equal(
|
|
92
|
+
(await f.user.login({ username: 'admin', password: 'admin' }, req)).code,
|
|
93
|
+
450,
|
|
94
|
+
);
|
|
95
|
+
assert.deepEqual(f.auth, { username: 'admin', password: 'admin' });
|
|
96
|
+
const results = await Promise.all([
|
|
97
|
+
f.user.initializeUser({ username: 'owner', password: 'first-password' }),
|
|
98
|
+
f.user.initializeUser({
|
|
99
|
+
username: 'attacker',
|
|
100
|
+
password: 'second-password',
|
|
101
|
+
}),
|
|
102
|
+
]);
|
|
103
|
+
assert.deepEqual(
|
|
104
|
+
results.map((x) => x.code),
|
|
105
|
+
[200, 450],
|
|
106
|
+
);
|
|
107
|
+
assert.equal(f.auth.username, 'owner');
|
|
108
|
+
assert.equal(await verifyPassword('first-password', f.auth.password), true);
|
|
109
|
+
assert.equal(
|
|
110
|
+
(
|
|
111
|
+
await f.user.initializeUser({
|
|
112
|
+
username: 'attacker',
|
|
113
|
+
password: 'third-password',
|
|
114
|
+
})
|
|
115
|
+
).code,
|
|
116
|
+
450,
|
|
117
|
+
);
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
test('password change revokes sessions and closes connected clients', async () => {
|
|
121
|
+
const f = fixture(initialized());
|
|
122
|
+
await f.user.updateUsernameAndPassword({
|
|
123
|
+
username: 'owner',
|
|
124
|
+
password: 'new-password',
|
|
125
|
+
});
|
|
126
|
+
assert.equal(f.auth.token, '');
|
|
127
|
+
assert.deepEqual(f.auth.tokens, {});
|
|
128
|
+
assert.equal(f.closed, 1);
|
|
129
|
+
assert.equal(await verifyPassword('new-password', f.auth.password), true);
|
|
130
|
+
assert.equal(
|
|
131
|
+
(await f.user.login({ username: 'owner', password: 'old-password' }, req))
|
|
132
|
+
.code,
|
|
133
|
+
400,
|
|
134
|
+
);
|
|
135
|
+
const login = await f.user.login(
|
|
136
|
+
{ username: 'owner', password: 'new-password' },
|
|
137
|
+
req,
|
|
138
|
+
);
|
|
139
|
+
assert.equal(login.code, 200);
|
|
140
|
+
jwt.verify(login.data.token, 'test-secret', { algorithms: ['HS384'] });
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
test('a concurrent old-password login cannot restore a session after reset', async () => {
|
|
144
|
+
const f = fixture(initialized());
|
|
145
|
+
const results = await Promise.all([
|
|
146
|
+
f.user.login({ username: 'owner', password: 'old-password' }, req),
|
|
147
|
+
f.user.resetAuthInfo({ password: 'new-password' }),
|
|
148
|
+
]);
|
|
149
|
+
assert.equal(results[0].code, 200);
|
|
150
|
+
assert.equal(f.auth.token, '');
|
|
151
|
+
assert.deepEqual(f.auth.tokens, {});
|
|
152
|
+
assert.equal(await verifyPassword('new-password', f.auth.password), true);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
test('legacy plaintext migrates after a successful login', async () => {
|
|
156
|
+
const f = fixture(initialized());
|
|
157
|
+
assert.equal(
|
|
158
|
+
(await f.user.login({ username: 'owner', password: 'old-password' }, req))
|
|
159
|
+
.code,
|
|
160
|
+
200,
|
|
161
|
+
);
|
|
162
|
+
assert.equal(isPasswordHash(f.auth.password), true);
|
|
163
|
+
assert.equal(await verifyPassword('old-password', f.auth.password), true);
|
|
164
|
+
});
|
|
165
|
+
|
|
166
|
+
test('TOTP failures are counted serially and further attempts are throttled', async () => {
|
|
167
|
+
const secret = authenticator.generateSecret();
|
|
168
|
+
const f = fixture({
|
|
169
|
+
...initialized(),
|
|
170
|
+
twoFactorActivated: true,
|
|
171
|
+
twoFactorSecret: secret,
|
|
172
|
+
});
|
|
173
|
+
assert.equal(
|
|
174
|
+
(await f.user.login({ username: 'owner', password: 'old-password' }, req))
|
|
175
|
+
.code,
|
|
176
|
+
420,
|
|
177
|
+
);
|
|
178
|
+
const badCode =
|
|
179
|
+
authenticator.generate(secret) === '000000' ? '111111' : '000000';
|
|
180
|
+
const results = await Promise.all(
|
|
181
|
+
Array.from({ length: 120 }, () =>
|
|
182
|
+
f.user.twoFactorLogin(
|
|
183
|
+
{ username: 'owner', password: 'old-password', code: badCode },
|
|
184
|
+
req,
|
|
185
|
+
),
|
|
186
|
+
),
|
|
187
|
+
);
|
|
188
|
+
assert.equal(f.auth.retries, 3);
|
|
189
|
+
assert.equal(results.filter((x) => x.code === 430).length, 3);
|
|
190
|
+
assert.equal(results.filter((x) => x.code === 410).length, 117);
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
test('TOTP challenge expires and valid codes cannot be reused in the same step', async () => {
|
|
194
|
+
const secret = authenticator.generateSecret();
|
|
195
|
+
const f = fixture({
|
|
196
|
+
...initialized(),
|
|
197
|
+
twoFactorActivated: true,
|
|
198
|
+
twoFactorSecret: secret,
|
|
199
|
+
});
|
|
200
|
+
await f.user.login({ username: 'owner', password: 'old-password' }, req);
|
|
201
|
+
f.auth.twoFactorExpiresAt = Date.now() - 1;
|
|
202
|
+
const payload = {
|
|
203
|
+
username: 'owner',
|
|
204
|
+
password: 'old-password',
|
|
205
|
+
code: authenticator.generate(secret),
|
|
206
|
+
};
|
|
207
|
+
assert.equal((await f.user.twoFactorLogin(payload, req)).code, 450);
|
|
208
|
+
await f.user.login({ username: 'owner', password: 'old-password' }, req);
|
|
209
|
+
assert.equal((await f.user.twoFactorLogin(payload, req)).code, 200);
|
|
210
|
+
await f.user.login({ username: 'owner', password: 'old-password' }, req);
|
|
211
|
+
assert.equal((await f.user.twoFactorLogin(payload, req)).code, 430);
|
|
212
|
+
});
|
|
213
|
+
|
|
214
|
+
test('active two-factor secret cannot be silently replaced and disabling revokes sessions', async () => {
|
|
215
|
+
const f = fixture({
|
|
216
|
+
...initialized(),
|
|
217
|
+
twoFactorActivated: true,
|
|
218
|
+
twoFactorSecret: authenticator.generateSecret(),
|
|
219
|
+
});
|
|
220
|
+
await assert.rejects(f.user.initTwoFactor());
|
|
221
|
+
await f.user.deactivateTwoFactor();
|
|
222
|
+
assert.equal(f.auth.token, '');
|
|
223
|
+
assert.deepEqual(f.auth.tokens, {});
|
|
224
|
+
assert.equal(f.auth.twoFactorSecret, '');
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
test('default credentials with historical metadata still require initialization', async () => {
|
|
228
|
+
const f = fixture({
|
|
229
|
+
username: 'admin',
|
|
230
|
+
password: 'admin',
|
|
231
|
+
retries: 1,
|
|
232
|
+
token: 'old-default-session',
|
|
233
|
+
});
|
|
234
|
+
assert.equal(
|
|
235
|
+
(await f.user.login({ username: 'admin', password: 'admin' }, req)).code,
|
|
236
|
+
450,
|
|
237
|
+
);
|
|
238
|
+
assert.equal(
|
|
239
|
+
(
|
|
240
|
+
await f.user.initializeUser({
|
|
241
|
+
username: 'owner',
|
|
242
|
+
password: 'new-password',
|
|
243
|
+
})
|
|
244
|
+
).code,
|
|
245
|
+
200,
|
|
246
|
+
);
|
|
247
|
+
assert.equal(f.auth.token, '');
|
|
248
|
+
});
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
const test = require('node:test');
|
|
2
|
+
const assert = require('node:assert/strict');
|
|
3
|
+
const fs = require('node:fs');
|
|
4
|
+
const vm = require('node:vm');
|
|
5
|
+
const ts = require('typescript');
|
|
6
|
+
const source = fs.readFileSync('back/app.ts', 'utf8');
|
|
7
|
+
const entry = source.indexOf('\nconst app = new Application();');
|
|
8
|
+
assert.ok(entry > 0, 'application entry point exists');
|
|
9
|
+
const compiled = ts.transpileModule(
|
|
10
|
+
source.slice(0, entry) + '\nmodule.exports = Application;',
|
|
11
|
+
{
|
|
12
|
+
compilerOptions: {
|
|
13
|
+
module: ts.ModuleKind.CommonJS,
|
|
14
|
+
target: ts.ScriptTarget.ES2022,
|
|
15
|
+
esModuleInterop: true,
|
|
16
|
+
},
|
|
17
|
+
},
|
|
18
|
+
).outputText;
|
|
19
|
+
function create(env) {
|
|
20
|
+
const calls = [];
|
|
21
|
+
const cluster = {
|
|
22
|
+
fork(options) {
|
|
23
|
+
const worker = {
|
|
24
|
+
id: calls.length + 1,
|
|
25
|
+
process: { pid: 100 + calls.length },
|
|
26
|
+
};
|
|
27
|
+
calls.push({ options, inherited: { ...env, ...options }, worker });
|
|
28
|
+
return worker;
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
const module = { exports: {} };
|
|
32
|
+
const sandbox = {
|
|
33
|
+
module,
|
|
34
|
+
exports: module.exports,
|
|
35
|
+
process: { env },
|
|
36
|
+
require(name) {
|
|
37
|
+
if (name === 'cluster') return cluster;
|
|
38
|
+
if (name === 'express') return () => ({ use() {} });
|
|
39
|
+
return {};
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
vm.runInNewContext(compiled, sandbox);
|
|
43
|
+
return { app: new module.exports(), calls };
|
|
44
|
+
}
|
|
45
|
+
test('PM2-managed primary disables only inherited worker APM and keeps worker metadata', () => {
|
|
46
|
+
const env = { pm_id: '0', pmx: 'true', CUSTOM_VALUE: 'kept' };
|
|
47
|
+
const { app, calls } = create(env);
|
|
48
|
+
for (const role of ['grpc', 'http']) app.forkWorker(role);
|
|
49
|
+
assert.deepEqual(
|
|
50
|
+
calls.map((x) => ({ ...x.options })),
|
|
51
|
+
[
|
|
52
|
+
{ SERVICE_TYPE: 'grpc', pmx: 'false' },
|
|
53
|
+
{ SERVICE_TYPE: 'http', pmx: 'false' },
|
|
54
|
+
],
|
|
55
|
+
);
|
|
56
|
+
assert.equal(env.pmx, 'true');
|
|
57
|
+
assert.equal(calls[0].inherited.CUSTOM_VALUE, 'kept');
|
|
58
|
+
for (const call of calls) {
|
|
59
|
+
const entry = app.workerMetadataMap.get(call.worker.id);
|
|
60
|
+
assert.equal(entry.pid, call.worker.process.pid);
|
|
61
|
+
assert.equal(entry.serviceType, call.options.SERVICE_TYPE);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
test('worker APM opt-in restores inherited PM2 settings, including explicit disable', () => {
|
|
65
|
+
for (const pmx of ['true', 'false']) {
|
|
66
|
+
const { app, calls } = create({ pm_id: '0', pmx, QL_WORKER_APM: 'true' });
|
|
67
|
+
app.forkWorker('http');
|
|
68
|
+
assert.equal(Object.hasOwn(calls[0].options, 'pmx'), false);
|
|
69
|
+
assert.equal(calls[0].inherited.pmx, pmx);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
test('standalone startup does not introduce a PM2-specific override', () => {
|
|
73
|
+
const { app, calls } = create({ CUSTOM_VALUE: 'kept' });
|
|
74
|
+
app.forkWorker('grpc');
|
|
75
|
+
assert.deepEqual({ ...calls[0].options }, { SERVICE_TYPE: 'grpc' });
|
|
76
|
+
assert.equal(calls[0].inherited.CUSTOM_VALUE, 'kept');
|
|
77
|
+
});
|
|
78
|
+
test('replacement workers receive the same monitoring policy', () => {
|
|
79
|
+
const { app, calls } = create({ pm_id: '0', pmx: 'true' });
|
|
80
|
+
app.forkWorker('grpc');
|
|
81
|
+
app.forkWorker('grpc');
|
|
82
|
+
assert.equal(calls[1].inherited.pmx, 'false');
|
|
83
|
+
assert.notEqual(calls[0].worker.id, calls[1].worker.id);
|
|
84
|
+
});
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
const assert = require('node:assert/strict');
|
|
2
|
+
const path = require('node:path');
|
|
3
|
+
const test = require('node:test');
|
|
4
|
+
const load = require('../helpers/load-security-module.cjs');
|
|
5
|
+
|
|
6
|
+
const back = (file) => path.join(__dirname, '../../back', file);
|
|
7
|
+
const protocol = load(back('protos/api.ts'));
|
|
8
|
+
const constants = load(back('config/const.ts'), {
|
|
9
|
+
'./container': { maybeSudo: (x) => x },
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
test('WPUSH survives protobuf and JSON round trips without changing existing modes', () => {
|
|
13
|
+
assert.equal(protocol.NotificationMode.wpush, 22);
|
|
14
|
+
for (let value = 0; value <= 22; value++) {
|
|
15
|
+
const name = protocol.notificationModeToJSON(value);
|
|
16
|
+
assert.equal(protocol.notificationModeFromJSON(name), value);
|
|
17
|
+
assert.equal(constants.NotificationModeStringMap[value], name);
|
|
18
|
+
}
|
|
19
|
+
const request = protocol.SystemNotifyRequest.create({
|
|
20
|
+
title: 'title',
|
|
21
|
+
content: 'content',
|
|
22
|
+
notificationInfo: {
|
|
23
|
+
type: 22,
|
|
24
|
+
wpushApiKey: 'test-key',
|
|
25
|
+
wpushChannel: 'feishu',
|
|
26
|
+
wpushTopicCode: 'test-topic',
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
const decoded = protocol.SystemNotifyRequest.decode(
|
|
30
|
+
protocol.SystemNotifyRequest.encode(request).finish(),
|
|
31
|
+
);
|
|
32
|
+
assert.equal(decoded.notificationInfo.wpushApiKey, 'test-key');
|
|
33
|
+
assert.equal(decoded.notificationInfo.wpushChannel, 'feishu');
|
|
34
|
+
assert.equal(decoded.notificationInfo.wpushTopicCode, 'test-topic');
|
|
35
|
+
assert.deepEqual(decoded, request);
|
|
36
|
+
assert.deepEqual(
|
|
37
|
+
protocol.SystemNotifyRequest.fromJSON(
|
|
38
|
+
protocol.SystemNotifyRequest.toJSON(request),
|
|
39
|
+
),
|
|
40
|
+
request,
|
|
41
|
+
);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
test('decoded SystemNotify requests reach WPUSH with explicit or saved configuration', async () => {
|
|
45
|
+
const calls = [];
|
|
46
|
+
const decorators = { Service: () => (x) => x, Inject: () => () => {} };
|
|
47
|
+
const NotificationService = load(back('services/notify.ts'), {
|
|
48
|
+
typedi: decorators,
|
|
49
|
+
'./user': {},
|
|
50
|
+
'../config/util': {},
|
|
51
|
+
'../shared/i18n': { t: (x) => x },
|
|
52
|
+
'../config/http': {
|
|
53
|
+
httpClient: {
|
|
54
|
+
post: async (url, options) => {
|
|
55
|
+
calls.push({ url, body: options.json });
|
|
56
|
+
return { code: 0 };
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
}).default;
|
|
61
|
+
const SystemService = load(back('services/system.ts'), {
|
|
62
|
+
typedi: decorators,
|
|
63
|
+
'../config': {},
|
|
64
|
+
'../config/const': constants,
|
|
65
|
+
'../config/util': {},
|
|
66
|
+
'../data/dependence': {},
|
|
67
|
+
'../data/system': {},
|
|
68
|
+
'../shared/pLimit': {},
|
|
69
|
+
'../shared/i18n': { t: (x) => x },
|
|
70
|
+
'./notify': {},
|
|
71
|
+
'./schedule': {},
|
|
72
|
+
'./sock': {},
|
|
73
|
+
}).default;
|
|
74
|
+
const notification = new NotificationService();
|
|
75
|
+
notification.userService = {
|
|
76
|
+
getNotificationMode: async () => ({
|
|
77
|
+
type: 'wpush',
|
|
78
|
+
wpushApiKey: 'saved-key',
|
|
79
|
+
}),
|
|
80
|
+
};
|
|
81
|
+
const system = new SystemService();
|
|
82
|
+
system.notificationService = notification;
|
|
83
|
+
|
|
84
|
+
for (const info of [
|
|
85
|
+
{
|
|
86
|
+
type: 22,
|
|
87
|
+
wpushApiKey: 'explicit-key',
|
|
88
|
+
wpushChannel: 'feishu',
|
|
89
|
+
wpushTopicCode: 'topic',
|
|
90
|
+
},
|
|
91
|
+
{ type: 22, wpushApiKey: 'explicit-key' },
|
|
92
|
+
undefined,
|
|
93
|
+
]) {
|
|
94
|
+
const decoded = protocol.SystemNotifyRequest.decode(
|
|
95
|
+
protocol.SystemNotifyRequest.encode(
|
|
96
|
+
protocol.SystemNotifyRequest.create({
|
|
97
|
+
title: 'title',
|
|
98
|
+
content: 'content',
|
|
99
|
+
notificationInfo: info,
|
|
100
|
+
}),
|
|
101
|
+
).finish(),
|
|
102
|
+
);
|
|
103
|
+
assert.equal((await system.notify(decoded)).code, 200);
|
|
104
|
+
assert.deepEqual(calls.at(-1), {
|
|
105
|
+
url: 'https://api.wpush.cn/api/v1/send',
|
|
106
|
+
body: {
|
|
107
|
+
apikey: info ? 'explicit-key' : 'saved-key',
|
|
108
|
+
title: 'title',
|
|
109
|
+
content: 'content',
|
|
110
|
+
channel: info?.wpushChannel || 'wechat',
|
|
111
|
+
...(info?.wpushTopicCode ? { topic_code: 'topic' } : {}),
|
|
112
|
+
},
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
});
|