@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.
Files changed (279) hide show
  1. package/.dockerignore +13 -0
  2. package/.env.example +7 -0
  3. package/AGENTS.md +2 -2
  4. package/README-en.md +24 -0
  5. package/README.md +24 -0
  6. package/back/protos/api.proto +9 -1
  7. package/back/protos/cron.proto +4 -1
  8. package/deploy/kubernetes/README.md +81 -0
  9. package/deploy/kubernetes/base/kustomization.yaml +5 -0
  10. package/deploy/kubernetes/base/qinglong.yaml +95 -0
  11. package/deploy/kubernetes/overlays/example/kustomization.yaml +10 -0
  12. package/docker/Dockerfile +31 -12
  13. package/docker/Dockerfile.310 +31 -12
  14. package/docker/Dockerfile.debian +22 -14
  15. package/docker/Dockerfile.debian310 +24 -14
  16. package/docker/build-manifest.cjs +28 -0
  17. package/docker/verify-build.cjs +49 -0
  18. package/docs/releases/2.22.0-validation.md +49 -0
  19. package/docs/releases/2.22.0.md +54 -0
  20. package/ecosystem.config.js +10 -1
  21. package/package.json +11 -6
  22. package/sample/config.sample.sh +17 -2
  23. package/sample/notify.js +118 -0
  24. package/sample/notify.py +93 -0
  25. package/scripts/benchmark-execution.cjs +96 -0
  26. package/scripts/write-build-info.cjs +27 -0
  27. package/shell/api.sh +41 -14
  28. package/shell/check.sh +59 -19
  29. package/shell/lang/en.sh +6 -0
  30. package/shell/lang/zh.sh +6 -0
  31. package/shell/node_path_cache.sh +128 -0
  32. package/shell/otask.sh +10 -1
  33. package/shell/preload/sitecustomize.js +5 -1
  34. package/shell/share.sh +26 -9
  35. package/shell/start.sh +6 -3
  36. package/shell/task.sh +13 -3
  37. package/shell/update.sh +65 -4
  38. package/static/build/api/clientIp.js +42 -0
  39. package/static/build/api/config.js +8 -16
  40. package/static/build/api/cron.js +39 -3
  41. package/static/build/api/dashboard.js +50 -6
  42. package/static/build/api/env.js +2 -2
  43. package/static/build/api/health.js +2 -2
  44. package/static/build/api/index.js +4 -0
  45. package/static/build/api/log.js +39 -19
  46. package/static/build/api/retention.js +63 -0
  47. package/static/build/api/script.js +23 -22
  48. package/static/build/api/subscription.js +16 -2
  49. package/static/build/api/system.js +31 -9
  50. package/static/build/api/user.js +75 -15
  51. package/static/build/app.js +63 -54
  52. package/static/build/bootstrap/database.js +51 -0
  53. package/static/build/config/const.js +2 -0
  54. package/static/build/config/grpcCerts.js +4 -4
  55. package/static/build/config/index.js +0 -4
  56. package/static/build/config/share.js +5 -4
  57. package/static/build/config/util.js +136 -41
  58. package/static/build/data/cron.js +1 -0
  59. package/static/build/data/notify.js +18 -1
  60. package/static/build/data/sock.js +1 -0
  61. package/static/build/loaders/app.js +8 -6
  62. package/static/build/loaders/db.js +5 -35
  63. package/static/build/loaders/deps.js +30 -22
  64. package/static/build/loaders/express.js +44 -32
  65. package/static/build/loaders/initData.js +10 -7
  66. package/static/build/loaders/initFile.js +1 -1
  67. package/static/build/loaders/initTask.js +3 -2
  68. package/static/build/loaders/server.js +1 -1
  69. package/static/build/loaders/sock.js +72 -6
  70. package/static/build/middlewares/monitoring.js +12 -33
  71. package/static/build/middlewares/protectedPathCase.js +17 -0
  72. package/static/build/protos/api.js +78 -2
  73. package/static/build/protos/cron.js +21 -4
  74. package/static/build/protos/health.js +1 -1
  75. package/static/build/schedule/addCron.js +76 -10
  76. package/static/build/schedule/api.js +5 -2
  77. package/static/build/schedule/client.js +38 -6
  78. package/static/build/schedule/delCron.js +11 -1
  79. package/static/build/schedule/health.js +72 -7
  80. package/static/build/services/config.js +5 -42
  81. package/static/build/services/cron.js +353 -164
  82. package/static/build/services/dependence.js +66 -18
  83. package/static/build/services/grpc.js +2 -2
  84. package/static/build/services/health.js +4 -7
  85. package/static/build/services/http.js +9 -3
  86. package/static/build/services/log.js +2 -3
  87. package/static/build/services/metrics.js +46 -14
  88. package/static/build/services/notify.js +73 -5
  89. package/static/build/services/retention.js +123 -0
  90. package/static/build/services/schedule.js +57 -33
  91. package/static/build/services/script.js +4 -5
  92. package/static/build/services/subscription.js +57 -34
  93. package/static/build/services/system.js +49 -11
  94. package/static/build/services/user.js +244 -31
  95. package/static/build/shared/auth.js +22 -3
  96. package/static/build/shared/authMutation.js +17 -0
  97. package/static/build/shared/childProcess.js +82 -0
  98. package/static/build/shared/clientIp.js +27 -0
  99. package/static/build/shared/errors.js +9 -0
  100. package/static/build/shared/fileAccess.js +60 -0
  101. package/static/build/shared/i18n.js +62 -4
  102. package/static/build/shared/logReader.js +85 -0
  103. package/static/build/shared/logStreamManager.js +80 -60
  104. package/static/build/shared/pLimit.js +3 -2
  105. package/static/build/shared/password.js +30 -0
  106. package/static/build/shared/retention.js +58 -0
  107. package/static/build/shared/runCron.js +28 -15
  108. package/static/build/shared/schedulerMutationLock.js +44 -0
  109. package/static/build/shared/schedulerReadiness.js +82 -0
  110. package/static/build/shared/schemaMigrations.js +58 -0
  111. package/static/build/shared/startupProcess.js +48 -0
  112. package/static/build/shared/store.js +7 -0
  113. package/static/build/shared/trustProxy.js +119 -0
  114. package/static/build/validation/schedule.js +12 -3
  115. package/static/dist/{1885.e1ea09f6.async.js → 1885.b8f427bf.async.js} +1 -1
  116. package/static/dist/2031.6af40025.async.js +1 -0
  117. package/static/dist/2693.51c2636b.async.js +1 -0
  118. package/static/dist/{2890.9e373f5b.async.js → 2890.add55e85.async.js} +1 -1
  119. package/static/dist/2901.2ca95295.async.js +1 -0
  120. package/static/dist/445.a65ff63b.async.js +1 -0
  121. package/static/dist/4736.1d2b5cb6.async.js +1 -0
  122. package/static/dist/{4859.6592cebb.async.js → 4859.97d6653c.async.js} +1 -1
  123. package/static/dist/{6013.4e38de36.async.js → 6013.db535339.async.js} +1 -1
  124. package/static/dist/6212.9e6d9913.async.js +1 -0
  125. package/static/dist/{6339.ab305e96.async.js → 6431.4603ad0e.async.js} +1 -1
  126. package/static/dist/{6872.42f939f1.async.js → 6872.a503ef55.async.js} +1 -1
  127. package/static/dist/7231.f7e5b668.async.js +1 -0
  128. package/static/dist/{7355.f9f263d8.async.js → 7355.fca746f5.async.js} +1 -1
  129. package/static/dist/{7508.7dcee91c.async.js → 7508.d90eac63.async.js} +1 -1
  130. package/static/dist/{7984.594296a5.async.js → 7984.eaac7402.async.js} +1 -1
  131. package/static/dist/8844.a0fef08e.async.js +1 -0
  132. package/static/dist/index.html +2 -2
  133. package/static/dist/layouts__index.633d3553.async.js +1 -0
  134. package/static/dist/preload_helper.cf7de3fa.js +1 -0
  135. package/static/dist/{src__pages__config__index.a22ff7dc.async.js → src__pages__config__index.9aba4054.async.js} +1 -1
  136. package/static/dist/src__pages__crontab__detail.86b2eebb.async.js +1 -0
  137. package/static/dist/src__pages__crontab__index.ae4e06f2.async.js +1 -0
  138. package/static/dist/{src__pages__crontab__logModal.0b8cce8c.async.js → src__pages__crontab__logModal.930535e2.async.js} +1 -1
  139. package/static/dist/src__pages__crontab__modal.a2c8fdcc.async.js +1 -0
  140. package/static/dist/src__pages__crontab__viewCreateModal.7b4f9cbe.async.js +1 -0
  141. package/static/dist/src__pages__crontab__viewManageModal.cd454ea0.async.js +1 -0
  142. package/static/dist/src__pages__dashboard__index.243c5a35.async.js +1 -0
  143. package/static/dist/src__pages__dashboard__taskResultModal.7795d6e1.async.js +1 -0
  144. package/static/dist/src__pages__dependence__index.874d501f.async.js +1 -0
  145. package/static/dist/src__pages__dependence__logModal.154efe7a.async.js +1 -0
  146. package/static/dist/src__pages__dependence__modal.a29c1a0f.async.js +1 -0
  147. package/static/dist/{src__pages__diff__index.013b7c75.async.js → src__pages__diff__index.1714b941.async.js} +1 -1
  148. package/static/dist/src__pages__env__editNameModal.c13d47d2.async.js +1 -0
  149. package/static/dist/src__pages__env__index.fd6fd2b0.async.js +1 -0
  150. package/static/dist/src__pages__env__modal.4d71adb3.async.js +1 -0
  151. package/static/dist/src__pages__error__index.aae50c94.async.js +1 -0
  152. package/static/dist/src__pages__initialization__index.82a2e967.async.js +1 -0
  153. package/static/dist/src__pages__log__index.71250e0d.async.js +1 -0
  154. package/static/dist/{src__pages__login__index.8c813eb1.async.js → src__pages__login__index.a0fd5ed8.async.js} +1 -1
  155. package/static/dist/src__pages__script__editModal.22acdf7c.async.js +1 -0
  156. package/static/dist/src__pages__script__editNameModal.1a521cc0.async.js +1 -0
  157. package/static/dist/src__pages__script__index.a18b2692.async.js +1 -0
  158. package/static/dist/src__pages__script__renameModal.0ab029e7.async.js +1 -0
  159. package/static/dist/src__pages__script__saveModal.8965b74c.async.js +1 -0
  160. package/static/dist/src__pages__script__setting.35ad4f02.async.js +1 -0
  161. package/static/dist/src__pages__setting__appModal.7eaeb9d3.async.js +1 -0
  162. package/static/dist/src__pages__setting__checkUpdate.d175b154.async.js +1 -0
  163. package/static/dist/src__pages__setting__clientIp.3a8711ed.async.js +1 -0
  164. package/static/dist/src__pages__setting__dependence.9c0f749b.async.js +1 -0
  165. package/static/dist/src__pages__setting__index.cb397741.async.js +1 -0
  166. package/static/dist/src__pages__setting__loginLog.e0a1f54d.async.js +1 -0
  167. package/static/dist/src__pages__setting__notification.2ffe4e5a.async.js +1 -0
  168. package/static/dist/src__pages__setting__other.3d0b8492.async.js +1 -0
  169. package/static/dist/{src__pages__setting__progress.8823ac90.async.js → src__pages__setting__progress.2ccae3d7.async.js} +1 -1
  170. package/static/dist/src__pages__setting__security.e2d71ebb.async.js +1 -0
  171. package/static/dist/src__pages__setting__systemLog.b3046955.async.js +1 -0
  172. package/static/dist/src__pages__subscription__index.43086a06.async.js +1 -0
  173. package/static/dist/src__pages__subscription__logModal.cdba5139.async.js +1 -0
  174. package/static/dist/src__pages__subscription__modal.38991e1e.async.js +1 -0
  175. package/static/dist/{umi.ca04a019.js → umi.fc019050.js} +1 -1
  176. package/test/back/auth-security.test.cjs +74 -0
  177. package/test/back/build-provenance.test.cjs +150 -0
  178. package/test/back/cron-log-name.test.cjs +110 -0
  179. package/test/back/cron-validation.test.cjs +45 -0
  180. package/test/back/dashboard-failures.test.cjs +173 -0
  181. package/test/back/database-bootstrap.test.cjs +193 -0
  182. package/test/back/dependence-cache-status.test.cjs +125 -0
  183. package/test/back/deprecated-file-routes.test.cjs +82 -0
  184. package/test/back/ecosystem.test.cjs +28 -0
  185. package/test/back/env-name-parsing.test.cjs +96 -0
  186. package/test/back/execution-lifecycle.test.cjs +236 -0
  187. package/test/back/file-access-security.test.cjs +47 -0
  188. package/test/back/fileTreeListing.test.cjs +57 -0
  189. package/test/back/grpc-cron-response.test.cjs +60 -0
  190. package/test/back/http-exclusive-listen.test.cjs +31 -0
  191. package/test/back/http-security.test.cjs +213 -0
  192. package/test/back/listen-security.test.cjs +67 -0
  193. package/test/back/log-path-security.test.cjs +158 -0
  194. package/test/back/logReader.test.cjs +72 -0
  195. package/test/back/manual-execution.test.cjs +85 -0
  196. package/test/back/manual-stop-claim.test.cjs +220 -0
  197. package/test/back/metrics.test.cjs +34 -0
  198. package/test/back/monitoring.test.cjs +73 -0
  199. package/test/back/node-path-cache.test.cjs +173 -0
  200. package/test/back/node-path-lock.test.cjs +178 -0
  201. package/test/back/npm-publication.test.cjs +70 -0
  202. package/test/back/primary-apm.test.cjs +24 -0
  203. package/test/back/process-exit-state.test.cjs +81 -0
  204. package/test/back/process-stop-signal.test.cjs +77 -0
  205. package/test/back/protected-path-case.test.cjs +58 -0
  206. package/test/back/qlServiceLogCommand.test.cjs +128 -0
  207. package/test/back/retention.test.cjs +131 -0
  208. package/test/back/role-loading.test.cjs +118 -0
  209. package/test/back/schedule-health.test.cjs +86 -0
  210. package/test/back/scheduler-file-lock.test.cjs +51 -0
  211. package/test/back/scheduler-mutation.test.cjs +312 -0
  212. package/test/back/scheduler-readiness.test.cjs +85 -0
  213. package/test/back/scheduler-reconciliation.test.cjs +152 -0
  214. package/test/back/scheduler-rpc-timeout.test.cjs +49 -0
  215. package/test/back/schema-migrations.test.cjs +127 -0
  216. package/test/back/shell-api-parsing.test.cjs +184 -0
  217. package/test/back/sock-polling.test.cjs +297 -0
  218. package/test/back/sock-security.test.cjs +72 -0
  219. package/test/back/start-env-preservation.test.cjs +53 -0
  220. package/test/back/stop-failure-feedback.test.cjs +158 -0
  221. package/test/back/stop-race.test.cjs +167 -0
  222. package/test/back/subscription-cleanup.test.cjs +53 -0
  223. package/test/back/subscription-stop-state.test.cjs +66 -0
  224. package/test/back/system-dependence-cache.test.cjs +126 -0
  225. package/test/back/task-time.test.cjs +116 -0
  226. package/test/back/user-api.test.cjs +99 -0
  227. package/test/back/user-security.test.cjs +248 -0
  228. package/test/back/worker-apm.test.cjs +84 -0
  229. package/test/back/wpush-grpc.test.cjs +115 -0
  230. package/test/front/cron-log-pagination.test.cjs +214 -0
  231. package/test/front/http-auth.test.cjs +152 -0
  232. package/test/front/http-error.test.cjs +29 -0
  233. package/test/helpers/load-security-module.cjs +42 -0
  234. package/version.yaml +19 -34
  235. package/CLAUDE.md +0 -43
  236. package/static/dist/1147.c420132e.async.js +0 -1
  237. package/static/dist/134.54df9e38.async.js +0 -1
  238. package/static/dist/2208.f7ba3dfa.async.js +0 -1
  239. package/static/dist/2286.164bb089.async.js +0 -1
  240. package/static/dist/3191.63263871.async.js +0 -1
  241. package/static/dist/4902.555f92ab.async.js +0 -1
  242. package/static/dist/5520.ff2cfd6b.async.js +0 -1
  243. package/static/dist/6431.c50479be.async.js +0 -1
  244. package/static/dist/8826.2447a104.async.js +0 -1
  245. package/static/dist/layouts__index.a7a2bfe0.async.js +0 -1
  246. package/static/dist/preload_helper.0431c0f3.js +0 -1
  247. package/static/dist/src__pages__crontab__detail.b9c36808.async.js +0 -1
  248. package/static/dist/src__pages__crontab__index.fed99fd0.async.js +0 -1
  249. package/static/dist/src__pages__crontab__modal.f7041c7c.async.js +0 -1
  250. package/static/dist/src__pages__crontab__viewCreateModal.4d589f66.async.js +0 -1
  251. package/static/dist/src__pages__crontab__viewManageModal.0e317746.async.js +0 -1
  252. package/static/dist/src__pages__dashboard__index.b30f2f47.async.js +0 -1
  253. package/static/dist/src__pages__dependence__index.3d87ceac.async.js +0 -1
  254. package/static/dist/src__pages__dependence__logModal.0681830b.async.js +0 -1
  255. package/static/dist/src__pages__dependence__modal.11124896.async.js +0 -1
  256. package/static/dist/src__pages__env__editNameModal.5d264b25.async.js +0 -1
  257. package/static/dist/src__pages__env__index.baa27d4e.async.js +0 -1
  258. package/static/dist/src__pages__env__modal.7f2ef1bc.async.js +0 -1
  259. package/static/dist/src__pages__error__index.f156b45e.async.js +0 -1
  260. package/static/dist/src__pages__initialization__index.e96d4ba8.async.js +0 -1
  261. package/static/dist/src__pages__log__index.e0978bae.async.js +0 -1
  262. package/static/dist/src__pages__script__editModal.cbf4ec0e.async.js +0 -1
  263. package/static/dist/src__pages__script__editNameModal.3e7e100d.async.js +0 -1
  264. package/static/dist/src__pages__script__index.2765d1b8.async.js +0 -1
  265. package/static/dist/src__pages__script__renameModal.5e987ef5.async.js +0 -1
  266. package/static/dist/src__pages__script__saveModal.3f9d23d6.async.js +0 -1
  267. package/static/dist/src__pages__script__setting.a535793a.async.js +0 -1
  268. package/static/dist/src__pages__setting__appModal.251cd14f.async.js +0 -1
  269. package/static/dist/src__pages__setting__checkUpdate.46efe057.async.js +0 -1
  270. package/static/dist/src__pages__setting__dependence.8a7a9529.async.js +0 -1
  271. package/static/dist/src__pages__setting__index.cc85fdfb.async.js +0 -1
  272. package/static/dist/src__pages__setting__loginLog.cea6056c.async.js +0 -1
  273. package/static/dist/src__pages__setting__notification.390fc905.async.js +0 -1
  274. package/static/dist/src__pages__setting__other.b22d2165.async.js +0 -1
  275. package/static/dist/src__pages__setting__security.598720a8.async.js +0 -1
  276. package/static/dist/src__pages__setting__systemLog.67406721.async.js +0 -1
  277. package/static/dist/src__pages__subscription__index.d0ab2abc.async.js +0 -1
  278. package/static/dist/src__pages__subscription__logModal.3864b37f.async.js +0 -1
  279. package/static/dist/src__pages__subscription__modal.3562c670.async.js +0 -1
@@ -0,0 +1,49 @@
1
+ const fs = require('node:fs');
2
+ const crypto = require('node:crypto');
3
+ const { execFileSync } = require('node:child_process');
4
+ const { collectBuildFiles } = require('./build-manifest.cjs');
5
+
6
+ const manifest = JSON.parse(fs.readFileSync('static/build-info.json', 'utf8'));
7
+ const sourceCommit = execFileSync('git', ['rev-parse', 'HEAD'], {
8
+ encoding: 'utf8',
9
+ }).trim();
10
+ const lockfileSha256 = crypto
11
+ .createHash('sha256')
12
+ .update(fs.readFileSync('pnpm-lock.yaml'))
13
+ .digest('hex');
14
+ if (
15
+ manifest.dirty !== false ||
16
+ manifest.sourceCommit !== sourceCommit ||
17
+ manifest.lockfileSha256 !== lockfileSha256
18
+ ) {
19
+ throw new Error(
20
+ 'Build artifacts do not match the checked-out source and lockfile. Rebuild from the same clean commit.',
21
+ );
22
+ }
23
+
24
+ if (process.argv[2]) {
25
+ const dependencyLock = crypto
26
+ .createHash('sha256')
27
+ .update(fs.readFileSync(process.argv[2]))
28
+ .digest('hex');
29
+ if (dependencyLock !== manifest.lockfileSha256)
30
+ throw new Error(
31
+ 'Production dependencies were built from a different lockfile.',
32
+ );
33
+ }
34
+
35
+ const actual = collectBuildFiles();
36
+ if (
37
+ manifest.version !== 1 ||
38
+ !manifest.files ||
39
+ JSON.stringify(Object.keys(actual).sort()) !==
40
+ JSON.stringify(Object.keys(manifest.files).sort())
41
+ )
42
+ throw new Error(
43
+ 'Build output file set mismatch. Rebuild the complete artifacts.',
44
+ );
45
+ for (const [file, hash] of Object.entries(actual)) {
46
+ if (hash !== manifest.files[file])
47
+ throw new Error(`Build output checksum mismatch: ${file}`);
48
+ }
49
+ console.log(`Verified build artifacts for ${sourceCommit}`);
@@ -0,0 +1,49 @@
1
+ # 2.22.0 发布准备验收
2
+
3
+ 日期:2026-09-26。候选代码基于 `origin/develop@801a71d7402f5d4b582318ed88ad00633357a531`,主包和面板版本统一为 `2.22.0`。本文件记录验收证据,不代表已经发布。
4
+
5
+ ## 自动化与构建
6
+
7
+ - 新增 5 项日志弹窗回归:大日志结束后读完分页、尾部截取不重复取历史、运行中空日志继续轮询、关闭取消定时器/丢弃在途响应、旧响应和不前进偏移不死循环。
8
+ - 用真实日志读取器写入 600 KiB 后结束任务:原 develop 在新增回归中失败,修复后 5 项全通过。
9
+ - macOS arm64、Node 20、按冻结锁文件独立安装依赖:228 项测试,225 通过、3 项平台相关跳过、0 失败。后端 TypeScript 与前端生产构建通过;前端有已有的大包体提示。
10
+ - `npm pack --dry-run` 成功,包含前后端产物,主包版本为 2.22.0;npm registry 查询该版本返回 E404(尚未占用,发布时仍需重新核实)。
11
+ - 上游基线 Linux CI 为 223 项回归全部通过;CLI Node 22.12/24 流水线通过,Node 24 的 291 项测试全部通过。该结果属于上游提交,不冒充本分支新的 CI 结果。
12
+ - GitNexus 对 `getCronLog` 修改前影响分析:LOW,直接调用者 `CronLogModal`,1 条流程。最终差异分析涉及日志弹窗流程;行号移动也将 `autoScroll` 列出,但该函数实现未修改。
13
+
14
+ ## 容器升级与回退
15
+
16
+ 测试仅使用新建账号、新建任务和隔离容器数据,不接触真实用户数据。
17
+
18
+ - 已发布旧版镜像 `whyour/qinglong:2.21.0` digest:`sha256:e72f77d855a86cfabf774de76b030731c38540b251a0c888038810fbcf256c48`。镜像内源码为 `9b37f064d815baf49b1869445bbd60e4209bacc9`,与当前 master 提交不同;这是已发布镜像到候选版的实际升级验收。
19
+ - 候选运行环境为 `whyour/qinglong:develop` digest:`sha256:35c5b9f2d0666ab7fcde954f175087c097e93fa852306360aa07b8aa0a5d0481`,revision 标签对应 `801a71d7402f5d4b582318ed88ad00633357a531`。装入本分支本地构建的前后端及版本文件。因此验证了候选代码的容器运行,不等同于最终发行镜像的完整构建验收。
20
+ - 旧版创建账号及真实 Shell 脚本任务并验证独立输出,停机复制完整 `/ql/data` 作为一致的升级前备份。
21
+ - 候选版读取该备份后原密码可登录、原任务仍存在并能真实执行,数据库已增加迁移表,测试账号密码已转为 scrypt(仅检查布尔值,未记录凭据)。
22
+ - 长运行脚本启动后确认实际 PID;停止后确认该进程不存在;立即重跑并再次停止成功。状态字段恢复为空闲;不把历史 PID 字段当作进程存活判断。
23
+ - 两步验证启用、密码阶段返回挑战、OTP 登录、同一验证码重放拒绝、关闭两步验证及重新登录均通过。
24
+ - 每 5 秒调度的测试脚本产生持续输出;本容器 HTTP 夹具订阅下载 V1 文件成功。
25
+ - 订阅夹具更新为 V2 后再次同步,落盘内容已变为 V2。
26
+ - 容器重启前调度标记 34 行,重启后 41 行,HTTP/gRPC 健康且可重新登录,确认定时注册恢复。
27
+ - 将升级前完整备份恢复到全新的 2.21.0 容器,原密码登录、原任务保留及真实脚本输出均通过。
28
+
29
+ ## 生产依赖审计:仍需处理
30
+
31
+ 在无共享 node_modules 的临时目录,使用候选 `package.json` 和 `pnpm-lock.yaml` 执行 `pnpm audit --prod --json`:414 个依赖,报告 3 Critical、38 High、49 Moderate、9 Low。数量是扫描公告命中,不等于独立漏洞数量或均能在面板中利用。审计时间与数据库变化会影响结果。
32
+
33
+ | Critical 命中 | 生产依赖路径 | 初步适用性与处理 |
34
+ | --- | --- | --- |
35
+ | protobufjs 7.5.4 | `@grpc/proto-loader → protobufjs` | 公告要求攻击者能控制加载的 schema/descriptor;当前主要使用仓库内生成的协议,尚未证实外部可控 schema 入口。仍应升级到修复版本并验证 gRPC。 |
36
+ | websocket-driver 0.7.4 | `sockjs → websocket-driver` / `faye-websocket` | 处理网络协议帧,不能用面板业务鉴权替代协议层修复;应升级到至少 0.7.5 并回归 WebSocket。 |
37
+ | tar 6.2.1 | `@whyour/sqlite3 → tar`、`@mapbox/node-pre-gyp → tar` | 主要涉及安装/构建解压链,不能直接等同于面板上传接口漏洞。修复跨 tar 主版本,需验证 SQLite 预编译下载和源码编译路径;另有 tar 7.5.20 的后续公告。 |
38
+
39
+ 参考:[protobufjs 公告](https://github.com/advisories/GHSA-xq3m-2v4x-88gg)、[websocket-driver 公告](https://github.com/advisories/GHSA-xv26-6w52-cph6)、[tar 公告](https://github.com/advisories/GHSA-23hp-3jrh-7fpw)。
40
+
41
+ High 命中还涉及 gRPC、multer、js-yaml、JWT 的 jws、undici 等运行时依赖。当前准备改动没有批量升级依赖;不能宣称安全扫描通过。正式发布仍需完成依赖升级与可达性评估、回归,或由维护者明确记录接受的风险。
42
+
43
+ ## 尚未放行的发布步骤
44
+
45
+ - 本分支新的 Linux CI 尚待执行。
46
+ - Python 3.10 镜像和全部架构的最终候选构建尚未验证;上游 develop 工作流跳过这些发布专用任务。
47
+ - 主包及 CLI 的 npm Trusted Publisher 设置属于 npm 账户配置,未通过代码或只读公开 registry 验证;不得把 `id-token: write` 视作已完成授权。
48
+ - 最终发版时确认 `publishTime` 与实际发布时间一致,并重新核对版本是否可发布。
49
+ - 完成上述事项前不合并到 master、不打正式 tag、不执行 `shell/pub.sh`。
@@ -0,0 +1,54 @@
1
+ # 青龙 2.22.0
2
+
3
+ ## 新增功能
4
+
5
+ - 独立远程命令行包 `@whyour/qinglong-cli`:覆盖任务、订阅、环境变量、配置、脚本、日志、依赖、应用、系统等 OpenAPI,支持认证、JSON 输出和中英文帮助。
6
+ - 可选面板内部 TypeScript 工具:任务执行、订阅同步、启动检查、升级重载和账号恢复。默认继续使用原 Shell 入口。
7
+ - 仪表盘支持点击今日成功、今日失败查看任务明细。
8
+ - 客户端 IP 和代理链诊断、可信代理配置、登录 IP 黑名单。
9
+ - 历史运行实例和统计数据的保留参数、清理预览、手动清理、依赖缓存清理和数据库压缩。保存保留参数不等于开启自动清理。
10
+ - WPUSH 通知,支持面板、JavaScript、Python 和 gRPC。
11
+ - `ql log [--lines <n>] [--nostream]` 查看服务日志。
12
+
13
+ ## 修复与优化
14
+
15
+ - 修复任务生命周期、调度锁、调度器就绪和恢复、排队与停止竞争、订阅清理,以及停止失败的反馈。
16
+ - 日志改为分块读取;任务结束后继续读完剩余分页,确保最后的输出和退出信息可见。修复中文任务日志名。
17
+ - 加固密码存储、JWT 有效性校验、两步验证、认证状态变更和文件路径访问。
18
+ - 修复过期登录令牌引起的页面刷新循环,完善任务字段校验提示。
19
+ - 减少常驻依赖和重复 WebSocket 鉴权,限制指标缓存和日志显示量,优化大目录枚举。
20
+ - 优化 Node 路径缓存与 Alpine 并发缓存锁,修正依赖缓存清理后的安装状态。
21
+ - 启动时保留 `.env` 配置;保留容器启动错误诊断;数据库迁移失败时中止启动。
22
+ - 镜像增加 provenance、SBOM、源码/静态产物/依赖锁文件一致性校验,改进多架构构建。
23
+
24
+ ## 升级兼容性
25
+
26
+ ### 数据备份与回退
27
+
28
+ 升级前停止面板和任务,备份完整持久化数据目录,并记录当前镜像的不可变 digest、启动参数、挂载和环境配置。不要只复制正在写入的 SQLite 主文件;必须保留完整离线数据备份。
29
+
30
+ 新版兼容旧密码;首次成功登录或修改密码后,密码会迁移为 scrypt 哈希。旧版不识别这种格式,因此**不能只回退镜像并继续使用升级后的数据**。
31
+
32
+ 需要回退时:停止新版,另外保存升级后的数据,恢复升级前的完整备份,再使用原镜像 digest 和原启动配置启动旧版。恢复备份会丢弃备份后产生的任务、配置和日志变更。如必须保留升级后数据,应单独验证旧版兼容性,并通过可信终端使用旧版账号恢复功能重新设置密码;不要手工把哈希当作密码使用。
33
+
34
+ 数据库迁移新增 `SchemaMigrations` 和任务排队标识;迁移异常会阻止启动。应检查启动日志并修复数据或恢复备份,不要通过删除数据库来绕过错误。
35
+
36
+ ### API 与日志
37
+
38
+ 旧文件读取路由 `/configs/:file`、`/scripts/:file`、`/logs/:file` 返回业务码 `410`,请改用对应的 `/detail` 接口(适用于 `/api` 和 `/open` 前缀)。
39
+
40
+ 日志接口默认返回尾部片段。客户端需要使用 `offset`、`nextOffset`、`total` 读取后续数据;任务已结束不代表所有日志已经读取完毕。面板仅保留有限长度的日志显示,完整文件仍在日志目录中。
41
+
42
+ 修改账号或两步验证配置会使旧会话失效;客户端应重新登录。IP 黑名单针对登录;反向代理场景应先在客户端 IP 页面确认识别结果再配置黑名单。
43
+
44
+ ### CLI
45
+
46
+ 远程 npm CLI 要求 Node >=22.12,推荐 Node 24。它与面板内置工具均使用 `ql` 名称;已有面板的机器应使用独立 npm prefix 或 `npm exec --package=@whyour/qinglong-cli -- ql ...`,避免覆盖内置命令。
47
+
48
+ 远程 npm 包不包含本机执行器、升级、重载和账号恢复实现,也不会自动切换面板入口。使用内部工具需单独构建完整 `cli/dist`,在满足 Node 版本要求的环境中显式设置 `QL_CLI_ROOT`;清除该变量并重启恢复 Shell 入口。标准面板镜像并未默认启用内部 TypeScript 工具。
49
+
50
+ ## 发布验收
51
+
52
+ 正式发布前应完成:旧版离线数据升级、登录与两步验证、定时/手动任务、停止后立即重跑、订阅更新、容器重启调度恢复和备份回退。发布者还需检查 Python 3.10 镜像矩阵,以及主包和 CLI 的 npm Trusted Publisher 配置。
53
+
54
+ 依赖审计与执行证据见同目录的 `2.22.0-validation.md`。通过单元测试或构建不代表完成所有平台和真实升级场景的验收。
@@ -1,13 +1,22 @@
1
+ const isContainer = process.env.QL_CONTAINER === 'true';
2
+
1
3
  module.exports = {
2
4
  apps: [
3
5
  {
4
6
  name: 'qinglong',
7
+ // Keep process supervision; enable injected diagnostics only on demand
8
+ // in containers. Standalone installs retain PM2's monitoring default.
9
+ pmx: !isContainer || process.env.QL_PRIMARY_APM === 'true',
5
10
  max_restarts: 5,
6
11
  kill_timeout: 1000,
7
12
  wait_ready: true,
8
13
  listen_timeout: 5000,
9
14
  source_map_support: true,
10
- time: true,
15
+ time: !isContainer,
16
+ out_file: isContainer ? '/dev/null' : undefined,
17
+ // Do not persist PM2 logs in containers, but keep early startup errors
18
+ // visible through `docker logs` before Winston is initialized.
19
+ error_file: isContainer ? '/proc/1/fd/2' : undefined,
11
20
  script: 'static/build/app.js',
12
21
  env: {
13
22
  http_proxy: '',
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@whyour/qinglong",
3
3
  "packageManager": "pnpm@8.3.1",
4
- "version": "2.21.0",
4
+ "version": "2.22.0",
5
5
  "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
6
6
  "repository": {
7
7
  "type": "git",
@@ -13,17 +13,22 @@
13
13
  "url": "https://github.com/whyour/qinglong/issues"
14
14
  },
15
15
  "scripts": {
16
+ "build:cli": "node cli/scripts/build.cjs",
17
+ "check:cli": "npm --prefix cli run check",
18
+ "test:cli": "npm run build:cli && node cli/scripts/test.cjs",
19
+ "cli": "node cli/dist/index.js",
16
20
  "start": "concurrently -n w: npm:start:*",
17
21
  "start:back": "nodemon ./back/app.ts",
18
22
  "start:front": "max dev",
19
23
  "build:front": "max build",
20
24
  "build:back": "tsc -p back/tsconfig.json",
25
+ "test": "TS_NODE_PROJECT=back/tsconfig.json node -r ts-node/register/transpile-only --test test/back/*.test.cjs test/front/*.test.cjs",
26
+ "benchmark:execution": "TS_NODE_PROJECT=back/tsconfig.json node -r ts-node/register/transpile-only scripts/benchmark-execution.cjs",
27
+ "build:info": "node scripts/write-build-info.cjs",
21
28
  "panel": "npm run build:back && node static/build/app.js",
22
29
  "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true,snakeToCamel=false",
23
30
  "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
24
- "postinstall": "max setup 2>/dev/null || true",
25
- "test": "umi-test",
26
- "test:coverage": "umi-test --coverage"
31
+ "postinstall": "max setup 2>/dev/null || true"
27
32
  },
28
33
  "gitHooks": {
29
34
  "pre-commit": "lint-staged"
@@ -67,7 +72,7 @@
67
72
  }
68
73
  },
69
74
  "overrides": {
70
- "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
75
+ "sqlite3": "npm:@whyour/sqlite3@1.1.2",
71
76
  "@codemirror/state": "6.5.4",
72
77
  "@codemirror/view": "6.39.16"
73
78
  }
@@ -111,7 +116,7 @@
111
116
  "request-ip": "3.3.0",
112
117
  "sequelize": "^6.37.5",
113
118
  "sockjs": "^0.3.24",
114
- "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
119
+ "sqlite3": "npm:@whyour/sqlite3@1.1.2",
115
120
  "toad-scheduler": "^3.0.1",
116
121
  "typedi": "^0.10.0",
117
122
  "undici": "^7.9.0",
@@ -241,14 +241,19 @@ export NTFY_PASSWORD=""
241
241
  export NTFY_ACTIONS=""
242
242
 
243
243
  ## 21. wxPusher
244
- ## 官方文档: https://wxpusher.zjiecode.com/docs/
245
- ## 管理后台: https://wxpusher.zjiecode.com/admin/
244
+ ### 方式一:标准发送(更强大)
245
+ #### 官方文档: https://wxpusher.zjiecode.com/docs/
246
+ #### 管理后台: https://wxpusher.zjiecode.com/admin/
246
247
  ## wxPusher 的 appToken
247
248
  export WXPUSHER_APP_TOKEN=""
248
249
  ## wxPusher 的 topicIds,多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
249
250
  export WXPUSHER_TOPIC_IDS=""
250
251
  ## wxPusher 的 用户ID,多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
251
252
  export WXPUSHER_UIDS=""
253
+ ### 方式二:极简发送(最简单,简单好用,一键配置,更推荐)
254
+ #### wxPusher 的 SPT(极简推送),扫码获取 https://wxpusher.zjiecode.com/docs/#/?id=spt
255
+ #### 多个用英文逗号,分隔,最多10个;与上面的 appToken 方式二选一即可
256
+ export WXPUSHER_SPT_LIST=""
252
257
 
253
258
  ## 22. 自定义通知
254
259
  ## 自定义通知 接收回调的URL
@@ -271,3 +276,13 @@ export OPENILINK_HUB_URL=""
271
276
  export OPENILINK_CONTEXT_TOKEN=""
272
277
 
273
278
  ## 其他需要的变量,脚本中需要的变量使用 export 变量名= 声明即可
279
+
280
+ ## 23. WPUSH
281
+ ## 官方文档: https://wpush.cn/docs
282
+ ## WPUSH_APIKEY (必填) 在 https://wpush.cn/settings 获取,以 WPUSH 开头
283
+ export WPUSH_APIKEY=""
284
+ ## 推送渠道,支持 wechat/app/sms/mail/webhook/dingtalk/feishu/wechat_work/clawbot/qqbot,默认 wechat
285
+ export WPUSH_CHANNEL="wechat"
286
+ ## 可选,Topic 广播编码;填写后按 Topic 推送
287
+ export WPUSH_TOPIC_CODE=""
288
+
package/sample/notify.js CHANGED
@@ -147,16 +147,26 @@ const push_config = {
147
147
  NTFY_PASSWORD: '', // 推送用户密码,可选
148
148
  NTFY_ACTIONS: '', // 推送用户动作,可选
149
149
 
150
+ // 方式一:标准发送(更强大)
150
151
  // 官方文档: https://wxpusher.zjiecode.com/docs/
151
152
  // 管理后台: https://wxpusher.zjiecode.com/admin/
152
153
  WXPUSHER_APP_TOKEN: '', // wxpusher 的 appToken
153
154
  WXPUSHER_TOPIC_IDS: '', // wxpusher 的 主题ID,多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
154
155
  WXPUSHER_UIDS: '', // wxpusher 的 用户ID,多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
156
+ // 方式二:极简发送(最简单,简单好用,一键配置,更推荐)
157
+ // wxPusher 的 SPT(极简推送),扫码获取 https://wxpusher.zjiecode.com/docs/#/?id=spt
158
+ // 多个用英文逗号,分隔,最多10个;与上面的 appToken 方式二选一即可
159
+ WXPUSHER_SPT_LIST: '', // wxpusher 的 SPT(极简推送),多个用英文逗号,分隔,最多10个
155
160
 
156
161
  // 官方文档: https://openilink.com/docs/hub/apps
157
162
  OPENILINK_APP_TOKEN: '', // OpeniLink 的 app_token,在 OpeniLink Hub 后台安装 App 后获取
158
163
  OPENILINK_HUB_URL: '', // OpeniLink Hub 地址,默认为 https://hub.openilink.com,自建 Hub 时填写自己的地址
159
164
  OPENILINK_CONTEXT_TOKEN: '', // OpeniLink 的 context_token,用于标识消息会话上下文,可从消息事件中获取
165
+
166
+ // WPUSH 官方文档: https://wpush.cn/docs
167
+ WPUSH_APIKEY: '', // WPUSH 的 API Key,在 https://wpush.cn/settings 获取
168
+ WPUSH_CHANNEL: 'wechat', // 推送渠道,支持 wechat/app/sms/mail/webhook/dingtalk/feishu/wechat_work/clawbot/qqbot
169
+ WPUSH_TOPIC_CODE: '', // 可选,Topic 广播编码
160
170
  };
161
171
 
162
172
  for (const key in push_config) {
@@ -1431,6 +1441,112 @@ function wxPusherNotify(text, desp) {
1431
1441
  });
1432
1442
  }
1433
1443
 
1444
+ function wxPusherSptNotify(text, desp) {
1445
+ return new Promise((resolve) => {
1446
+ const { WXPUSHER_SPT_LIST } = push_config;
1447
+ if (WXPUSHER_SPT_LIST) {
1448
+ // 处理 SPT,将逗号分隔的字符串转为数组
1449
+ const spts = WXPUSHER_SPT_LIST.split(',')
1450
+ .map((spt) => spt.trim())
1451
+ .filter((spt) => spt);
1452
+
1453
+ if (!spts.length) {
1454
+ console.log('wxpusher SPT 不能为空!!');
1455
+ return resolve();
1456
+ }
1457
+ if (spts.length > 10) {
1458
+ console.log('wxpusher SPT 最多支持 10 个!!');
1459
+ return resolve();
1460
+ }
1461
+
1462
+ const body = {
1463
+ content: `<h1>${text}</h1><br/><div style='white-space: pre-wrap;'>${desp}</div>`,
1464
+ summary: text,
1465
+ contentType: 2,
1466
+ // 单个 SPT 用 spt,多个用 sptList
1467
+ ...(spts.length === 1 ? { spt: spts[0] } : { sptList: spts }),
1468
+ };
1469
+
1470
+ const options = {
1471
+ url: 'https://wxpusher.zjiecode.com/api/send/message/simple-push',
1472
+ body: JSON.stringify(body),
1473
+ headers: {
1474
+ 'Content-Type': 'application/json',
1475
+ },
1476
+ timeout,
1477
+ };
1478
+
1479
+ $.post(options, (err, resp, data) => {
1480
+ try {
1481
+ if (err) {
1482
+ console.log('wxpusher SPT 发送通知消息失败!\n', err);
1483
+ } else {
1484
+ if (data.code === 1000) {
1485
+ console.log('wxpusher SPT 发送通知消息完成!');
1486
+ } else {
1487
+ console.log(`wxpusher SPT 发送通知消息异常:${data.msg}`);
1488
+ }
1489
+ }
1490
+ } catch (e) {
1491
+ $.logErr(e, resp);
1492
+ } finally {
1493
+ resolve(data);
1494
+ }
1495
+ });
1496
+ } else {
1497
+ resolve();
1498
+ }
1499
+ });
1500
+ }
1501
+
1502
+
1503
+
1504
+ function wpushNotify(text, desp) {
1505
+ return new Promise((resolve) => {
1506
+ const { WPUSH_APIKEY, WPUSH_CHANNEL, WPUSH_TOPIC_CODE } = push_config;
1507
+ if (WPUSH_APIKEY) {
1508
+ const body = {
1509
+ apikey: `${WPUSH_APIKEY}`,
1510
+ title: `${text}`,
1511
+ content: `${desp}`,
1512
+ channel: `${WPUSH_CHANNEL || 'wechat'}`,
1513
+ };
1514
+ if (WPUSH_TOPIC_CODE) {
1515
+ body.topic_code = WPUSH_TOPIC_CODE;
1516
+ }
1517
+ const options = {
1518
+ url: `https://api.wpush.cn/api/v1/send`,
1519
+ body: JSON.stringify(body),
1520
+ headers: {
1521
+ 'Content-Type': 'application/json',
1522
+ },
1523
+ timeout,
1524
+ };
1525
+ $.post(options, (err, resp, data) => {
1526
+ try {
1527
+ if (err) {
1528
+ console.log('WPUSH 发送通知消息失败!\n', err);
1529
+ } else {
1530
+ if (data.code === 0) {
1531
+ console.log('WPUSH 发送通知消息成功!');
1532
+ } else {
1533
+ console.log(
1534
+ `WPUSH 发送通知消息异常:${data.message || JSON.stringify(data)}`,
1535
+ );
1536
+ }
1537
+ }
1538
+ } catch (e) {
1539
+ $.logErr(e, resp);
1540
+ } finally {
1541
+ resolve(data);
1542
+ }
1543
+ });
1544
+ } else {
1545
+ resolve();
1546
+ }
1547
+ });
1548
+ }
1549
+
1434
1550
  function openiLinkNotify(text, desp) {
1435
1551
  return new Promise((resolve) => {
1436
1552
  const { OPENILINK_APP_TOKEN, OPENILINK_HUB_URL, OPENILINK_CONTEXT_TOKEN } =
@@ -1609,7 +1725,9 @@ async function sendNotify(text, desp, params = {}) {
1609
1725
  qmsgNotify(text, desp), // 自定义通知
1610
1726
  ntfyNotify(text, desp), // Ntfy
1611
1727
  wxPusherNotify(text, desp), // wxpusher
1728
+ wxPusherSptNotify(text, desp), // wxpusher SPT
1612
1729
  openiLinkNotify(text, desp), // OpeniLink
1730
+ wpushNotify(text, desp), // WPUSH
1613
1731
  ]);
1614
1732
  }
1615
1733
 
package/sample/notify.py CHANGED
@@ -133,13 +133,25 @@ push_config = {
133
133
  'NTFY_PASSWORD': '', # 推送用户密码,可选
134
134
  'NTFY_ACTIONS': '', # 推送用户动作,可选
135
135
 
136
+ ### 方式一:标准发送(更强大)
137
+ #### 官方文档: https://wxpusher.zjiecode.com/docs/
138
+ #### 管理后台: https://wxpusher.zjiecode.com/admin/
136
139
  'WXPUSHER_APP_TOKEN': '', # wxpusher 的 appToken 官方文档: https://wxpusher.zjiecode.com/docs/ 管理后台: https://wxpusher.zjiecode.com/admin/
137
140
  'WXPUSHER_TOPIC_IDS': '', # wxpusher 的 主题ID,多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
138
141
  'WXPUSHER_UIDS': '', # wxpusher 的 用户ID,多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
142
+ ### 方式二:极简发送(最简单,简单好用,一键配置,更推荐)
143
+ #### wxPusher 的 SPT(极简推送),扫码获取 https://wxpusher.zjiecode.com/docs/#/?id=spt
144
+ #### 多个用英文逗号,分隔,最多10个;与上面的 appToken 方式二选一即可
145
+ 'WXPUSHER_SPT_LIST': '', # wxpusher 的 SPT(极简推送),多个用英文逗号,分隔,最多10个 官方文档: https://wxpusher.zjiecode.com/docs/#/?id=spt
139
146
 
140
147
  'OPENILINK_APP_TOKEN': '', # OpeniLink 的 app_token,在 OpeniLink Hub 后台安装 App 后获取 官方文档: https://openilink.com/docs/hub/apps
141
148
  'OPENILINK_HUB_URL': '', # OpeniLink Hub 地址,默认为 https://hub.openilink.com,自建 Hub 时填写自己的地址
142
149
  'OPENILINK_CONTEXT_TOKEN': '', # OpeniLink 的 context_token,用于标识消息会话上下文,可从消息事件中获取
150
+
151
+ # WPUSH 官方文档: https://wpush.cn/docs
152
+ 'WPUSH_APIKEY': '', # WPUSH 的 API Key,在 https://wpush.cn/settings 获取
153
+ 'WPUSH_CHANNEL': 'wechat', # 推送渠道,支持 wechat/app/sms/mail/webhook/dingtalk/feishu/wechat_work/clawbot/qqbot
154
+ 'WPUSH_TOPIC_CODE': '', # 可选,Topic 广播编码
143
155
  }
144
156
  # fmt: on
145
157
 
@@ -902,6 +914,83 @@ def wxpusher_bot(title: str, content: str) -> None:
902
914
  print(f"wxpusher 推送失败!错误信息:{response.get('msg')}")
903
915
 
904
916
 
917
+ def wxpusher_spt(title: str, content: str) -> None:
918
+ """
919
+ 通过 wxpusher 极简推送(SPT)推送消息。
920
+ 支持的环境变量:
921
+ - WXPUSHER_SPT_LIST: SPT, 多个用英文逗号,分隔, 最多10个
922
+ """
923
+ if not push_config.get("WXPUSHER_SPT_LIST"):
924
+ return
925
+
926
+ # 处理 SPT,将逗号分隔的字符串转为数组
927
+ spts = [
928
+ spt.strip()
929
+ for spt in push_config.get("WXPUSHER_SPT_LIST").split(",")
930
+ if spt.strip()
931
+ ]
932
+
933
+ if not spts:
934
+ print("wxpusher 服务的 WXPUSHER_SPT_LIST 不能为空!!")
935
+ return
936
+ if len(spts) > 10:
937
+ print("wxpusher 服务的 WXPUSHER_SPT_LIST 最多支持 10 个!!")
938
+ return
939
+
940
+ print("wxpusher SPT 服务启动")
941
+
942
+ url = "https://wxpusher.zjiecode.com/api/send/message/simple-push"
943
+
944
+ data = {
945
+ "content": f"<h1>{title}</h1><br/><div style='white-space: pre-wrap;'>{content}</div>",
946
+ "summary": title,
947
+ "contentType": 2,
948
+ }
949
+ # 单个 SPT 用 spt,多个用 sptList
950
+ if len(spts) == 1:
951
+ data["spt"] = spts[0]
952
+ else:
953
+ data["sptList"] = spts
954
+
955
+ headers = {"Content-Type": "application/json"}
956
+ response = requests.post(url=url, json=data, headers=headers).json()
957
+
958
+ if response.get("code") == 1000:
959
+ print("wxpusher SPT 推送成功!")
960
+ else:
961
+ print(f"wxpusher SPT 推送失败!错误信息:{response.get('msg')}")
962
+
963
+
964
+
965
+ def wpush(title: str, content: str) -> None:
966
+ """
967
+ 通过 WPUSH 推送消息。
968
+ 官方文档: https://wpush.cn/docs
969
+ """
970
+ if not push_config.get("WPUSH_APIKEY"):
971
+ return
972
+
973
+ print("WPUSH 服务启动")
974
+
975
+ url = "https://api.wpush.cn/api/v1/send"
976
+ data = {
977
+ "apikey": push_config.get("WPUSH_APIKEY"),
978
+ "title": title,
979
+ "content": content,
980
+ "channel": push_config.get("WPUSH_CHANNEL") or "wechat",
981
+ }
982
+ if push_config.get("WPUSH_TOPIC_CODE"):
983
+ data["topic_code"] = push_config.get("WPUSH_TOPIC_CODE")
984
+
985
+ headers = {"Content-Type": "application/json"}
986
+ response = requests.post(url=url, json=data, headers=headers, timeout=15).json()
987
+
988
+ if response.get("code") == 0:
989
+ print("WPUSH 推送成功!")
990
+ else:
991
+ print(f'WPUSH 推送失败!错误信息:{response.get("message") or response}')
992
+
993
+
905
994
  def openilink(title: str, content: str) -> None:
906
995
  """
907
996
  通过 OpeniLink 推送消息。
@@ -1104,8 +1193,12 @@ def add_notify_function():
1104
1193
  push_config.get("WXPUSHER_TOPIC_IDS") or push_config.get("WXPUSHER_UIDS")
1105
1194
  ):
1106
1195
  notify_function.append(wxpusher_bot)
1196
+ if push_config.get("WXPUSHER_SPT_LIST"):
1197
+ notify_function.append(wxpusher_spt)
1107
1198
  if push_config.get("OPENILINK_APP_TOKEN"):
1108
1199
  notify_function.append(openilink)
1200
+ if push_config.get("WPUSH_APIKEY"):
1201
+ notify_function.append(wpush)
1109
1202
  if not notify_function:
1110
1203
  print(f"无推送渠道,请检查通知变量是否正确")
1111
1204
  return notify_function
@@ -0,0 +1,96 @@
1
+ // Microbenchmark of the process observer, not a container or scheduler benchmark.
2
+ const fs = require('node:fs');
3
+ const os = require('node:os');
4
+ const crypto = require('node:crypto');
5
+ const { spawn, execFileSync } = require('node:child_process');
6
+ const { performance } = require('node:perf_hooks');
7
+ const { observeChildProcess } = require('../back/shared/childProcess');
8
+
9
+ const args = process.argv.slice(2).filter((arg) => arg !== '--');
10
+ const runsArg = args.find((arg) => arg.startsWith('--runs='));
11
+ const runs = runsArg ? Number(runsArg.slice(7)) : 30;
12
+ if (!Number.isInteger(runs) || runs < 3 || runs > 10000)
13
+ throw new Error('runs must be between 3 and 10000');
14
+ const output = args.find((arg) => arg.startsWith('--output='))?.slice(9);
15
+ const git = (...args) => execFileSync('git', args, { encoding: 'utf8' }).trim();
16
+ const scenarios = [
17
+ { name: 'empty-node', command: '' },
18
+ {
19
+ name: 'log-1MiB',
20
+ command: 'process.stdout.write("x".repeat(1024 * 1024))',
21
+ bytes: 1024 * 1024,
22
+ },
23
+ { name: 'spawn-failure', shell: '/nonexistent-ql-benchmark-shell' },
24
+ ];
25
+
26
+ (async () => {
27
+ const report = {
28
+ schema: 1,
29
+ observerSha256: crypto
30
+ .createHash('sha256')
31
+ .update(fs.readFileSync('back/shared/childProcess.ts'))
32
+ .digest('hex'),
33
+ benchmarkSha256: crypto
34
+ .createHash('sha256')
35
+ .update(fs.readFileSync(__filename))
36
+ .digest('hex'),
37
+ scope:
38
+ 'local process observer only; parent CPU excludes child CPU; no panel/container load measured',
39
+ sourceCommit: git('rev-parse', 'HEAD'),
40
+ dirty: git('status', '--porcelain') !== '',
41
+ lockfileSha256: crypto
42
+ .createHash('sha256')
43
+ .update(fs.readFileSync('pnpm-lock.yaml'))
44
+ .digest('hex'),
45
+ node: process.version,
46
+ platform: process.platform,
47
+ arch: process.arch,
48
+ cpu: os.cpus()[0]?.model,
49
+ cores: os.cpus().length,
50
+ timestamp: new Date().toISOString(),
51
+ runs,
52
+ scenarios: [],
53
+ };
54
+ for (const scenario of scenarios) {
55
+ const samples = [];
56
+ const cpuStart = process.cpuUsage();
57
+ for (let index = 0; index < runs; index++) {
58
+ const start = performance.now();
59
+ let bytes = 0;
60
+ const child = scenario.shell
61
+ ? spawn('true', { shell: scenario.shell })
62
+ : spawn(process.execPath, ['-e', scenario.command]);
63
+ const result = await observeChildProcess(child, {
64
+ onStdout: async (chunk) => {
65
+ bytes += Buffer.byteLength(chunk);
66
+ },
67
+ }).completed;
68
+ if (scenario.shell ? !result.error : result.error || result.code !== 0)
69
+ throw new Error(`Unexpected result: ${scenario.name}`);
70
+ if (bytes !== (scenario.bytes || 0))
71
+ throw new Error(`Output loss: ${scenario.name}`);
72
+ samples.push({
73
+ wallMs: performance.now() - start,
74
+ bytes,
75
+ code: result.code,
76
+ error: result.error?.message,
77
+ });
78
+ }
79
+ const sorted = samples.map((sample) => sample.wallMs).sort((a, b) => a - b);
80
+ const percentile = (p) => sorted[Math.ceil(sorted.length * p) - 1];
81
+ report.scenarios.push({
82
+ name: scenario.name,
83
+ parentCpuMicros: process.cpuUsage(cpuStart),
84
+ p50Ms: percentile(0.5),
85
+ p95Ms: percentile(0.95),
86
+ ...(runs >= 100 ? { p99Ms: percentile(0.99) } : {}),
87
+ samples,
88
+ });
89
+ }
90
+ const json = JSON.stringify(report, null, 2) + '\n';
91
+ if (output) fs.writeFileSync(output, json);
92
+ else process.stdout.write(json);
93
+ })().catch((error) => {
94
+ console.error(error);
95
+ process.exitCode = 1;
96
+ });
@@ -0,0 +1,27 @@
1
+ const fs = require('node:fs');
2
+ const path = require('node:path');
3
+ const crypto = require('node:crypto');
4
+ const { execFileSync } = require('node:child_process');
5
+ const { collectBuildFiles } = require('../docker/build-manifest.cjs');
6
+
7
+ const root = process.cwd();
8
+ for (const output of ['static/build/app.js', 'static/dist/index.html']) {
9
+ if (!fs.existsSync(path.join(root, output)))
10
+ throw new Error(`Missing build output: ${output}`);
11
+ }
12
+ const git = (...args) =>
13
+ execFileSync('git', args, { cwd: root, encoding: 'utf8' }).trim();
14
+ const manifest = {
15
+ version: 1,
16
+ files: collectBuildFiles(),
17
+ sourceCommit: git('rev-parse', 'HEAD'),
18
+ dirty: git('status', '--porcelain', '--untracked-files=all') !== '',
19
+ lockfileSha256: crypto
20
+ .createHash('sha256')
21
+ .update(fs.readFileSync('pnpm-lock.yaml'))
22
+ .digest('hex'),
23
+ };
24
+ fs.writeFileSync(
25
+ 'static/build-info.json',
26
+ JSON.stringify(manifest, null, 2) + '\n',
27
+ );