@whyour/qinglong 2.21.0 → 2.23.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 +8 -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/development/node-cron-migration.md +49 -0
- package/docs/development/task-startup.md +78 -0
- package/docs/releases/2.22.0-validation.md +49 -0
- package/docs/releases/2.22.0.md +62 -0
- package/docs/releases/2.23.0.md +33 -0
- package/docs/script-history.md +53 -0
- package/ecosystem.config.js +10 -1
- package/package.json +19 -13
- 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/benchmark-script-history.cjs +39 -0
- package/scripts/publish-static.sh +34 -0
- package/scripts/sync-static.sh +20 -0
- package/scripts/wait-for-mirror.sh +214 -0
- package/scripts/write-build-info.cjs +27 -0
- package/shell/api.sh +96 -83
- 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 +136 -0
- package/shell/otask.sh +17 -10
- package/shell/preload/sitecustomize.js +11 -3
- package/shell/preload/sitecustomize.py +4 -2
- package/shell/share.sh +27 -10
- package/shell/start.sh +6 -3
- package/shell/task-timeout.sh +63 -0
- package/shell/task.sh +21 -9
- package/shell/update.sh +104 -98
- package/shell/upgrade.cjs +8 -0
- package/static/build/api/clientIp.js +42 -0
- package/static/build/api/config.js +9 -21
- package/static/build/api/cron.js +39 -3
- package/static/build/api/dashboard.js +50 -6
- package/static/build/api/env.js +17 -16
- 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/open.js +2 -1
- package/static/build/api/retention.js +63 -0
- package/static/build/api/script.js +172 -25
- package/static/build/api/subscription.js +19 -8
- package/static/build/api/system.js +66 -12
- 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 +93 -44
- package/static/build/config/index.js +0 -4
- package/static/build/config/share.js +5 -4
- package/static/build/config/subscription.js +19 -11
- package/static/build/config/util.js +142 -45
- 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 +46 -32
- package/static/build/loaders/initData.js +26 -33
- package/static/build/loaders/initFile.js +1 -1
- package/static/build/loaders/initTask.js +14 -3
- 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/middlewares/uniqueConstraintError.js +15 -0
- package/static/build/protos/api.js +78 -2
- package/static/build/protos/cron.js +83 -5
- package/static/build/protos/health.js +1 -1
- package/static/build/schedule/addCron.js +67 -19
- package/static/build/schedule/api.js +5 -2
- package/static/build/schedule/client.js +56 -6
- package/static/build/schedule/delCron.js +11 -1
- package/static/build/schedule/health.js +72 -7
- package/static/build/schedule/setConcurrency.js +27 -0
- package/static/build/services/config.js +5 -43
- package/static/build/services/cron.js +389 -174
- package/static/build/services/dependence.js +66 -18
- package/static/build/services/env.js +1 -1
- package/static/build/services/grpc.js +4 -3
- 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/open.js +106 -31
- package/static/build/services/retention.js +123 -0
- package/static/build/services/schedule.js +77 -43
- package/static/build/services/script.js +4 -5
- package/static/build/services/scriptHistory.js +30 -0
- package/static/build/services/sshKey.js +39 -14
- package/static/build/services/subscription.js +161 -87
- package/static/build/services/system.js +116 -43
- package/static/build/services/user.js +255 -37
- 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/cronCommand.js +17 -0
- package/static/build/shared/cronSchedule.js +101 -0
- package/static/build/shared/cronScheduler.js +73 -0
- package/static/build/shared/errors.js +9 -0
- package/static/build/shared/fileAccess.js +60 -0
- package/static/build/shared/i18n.js +63 -4
- package/static/build/shared/logPath.js +15 -0
- package/static/build/shared/logReader.js +85 -0
- package/static/build/shared/logStreamManager.js +80 -60
- package/static/build/shared/loginThrottle.js +45 -0
- package/static/build/shared/pLimit.js +22 -8
- package/static/build/shared/password.js +30 -0
- package/static/build/shared/retention.js +58 -0
- package/static/build/shared/runCron.js +39 -17
- 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/scriptHistory.js +445 -0
- package/static/build/shared/shellQuote.js +11 -0
- package/static/build/shared/startupProcess.js +48 -0
- package/static/build/shared/store.js +7 -0
- package/static/build/shared/subscriptionMutationLock.js +34 -0
- package/static/build/shared/subscriptionPath.js +41 -0
- package/static/build/shared/subscriptionStorage.js +98 -0
- package/static/build/shared/trustProxy.js +119 -0
- package/static/build/shared/utils.js +2 -1
- package/static/build/token.js +3 -14
- package/static/build/validation/schedule.js +6 -12
- 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/292.264757f0.async.js +1 -0
- package/static/dist/3512.95e41255.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/{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.01fcd534.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.0fa8b421.async.js +1 -0
- package/static/dist/src__pages__diff__index.b94e5dc5.async.js +1 -0
- 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.afabf073.async.js +1 -0
- package/static/dist/src__pages__script__editNameModal.789ad87b.async.js +1 -0
- package/static/dist/src__pages__script__historyDrawer.8c58d958.async.js +1 -0
- package/static/dist/src__pages__script__historyDrawer.a449193a.chunk.css +1 -0
- package/static/dist/src__pages__script__index.ab360776.chunk.css +1 -0
- package/static/dist/src__pages__script__index.fc575945.async.js +1 -0
- package/static/dist/src__pages__script__renameModal.0ab029e7.async.js +1 -0
- package/static/dist/src__pages__script__saveModal.8fca1a22.async.js +1 -0
- package/static/dist/src__pages__script__saveWithHistory.99ece830.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.30868ba8.async.js +1 -0
- package/static/dist/{umi.ca04a019.js → umi.3a24a9fa.js} +1 -1
- package/test/back/advisory-input-security.test.cjs +416 -0
- package/test/back/auth-security.test.cjs +74 -0
- package/test/back/build-provenance.test.cjs +150 -0
- package/test/back/code-scanning-security.test.cjs +189 -0
- package/test/back/cron-log-name.test.cjs +110 -0
- package/test/back/cron-macros.test.cjs +51 -0
- package/test/back/cron-schedule-compatibility.test.cjs +69 -0
- package/test/back/cron-scheduler-routing.test.cjs +59 -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/draft-path-security.test.cjs +235 -0
- package/test/back/ecosystem.test.cjs +28 -0
- package/test/back/env-import-security.test.cjs +91 -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-scope.test.cjs +180 -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/grpc-mtls-security.test.cjs +136 -0
- package/test/back/http-exclusive-listen.test.cjs +31 -0
- package/test/back/http-security.test.cjs +313 -0
- package/test/back/legacy-cron-recovery.test.cjs +76 -0
- package/test/back/linux-mirror-result.test.cjs +176 -0
- package/test/back/listen-security.test.cjs +68 -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/mirror-status.test.cjs +257 -0
- package/test/back/monitoring.test.cjs +73 -0
- package/test/back/node-cron-migration.test.cjs +65 -0
- package/test/back/node-path-cache.test.cjs +202 -0
- package/test/back/node-path-lock.test.cjs +182 -0
- package/test/back/npm-publication.test.cjs +70 -0
- package/test/back/preload-lazy-notify.test.cjs +168 -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/queued-cron-invalidation.test.cjs +98 -0
- package/test/back/restart-instance-recovery.test.cjs +116 -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-bulk-recovery.test.cjs +40 -0
- package/test/back/scheduler-concurrency.test.cjs +411 -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 +206 -0
- package/test/back/scheduler-rpc-timeout.test.cjs +49 -0
- package/test/back/schema-migrations.test.cjs +127 -0
- package/test/back/script-file-access.test.cjs +210 -0
- package/test/back/script-history-api.test.cjs +551 -0
- package/test/back/script-history.test.cjs +383 -0
- package/test/back/shell-api-parsing.test.cjs +184 -0
- package/test/back/shell-translation-output.test.cjs +16 -0
- package/test/back/shell-upgrade.test.cjs +312 -0
- package/test/back/shellApiToken.test.cjs +151 -0
- package/test/back/sock-polling.test.cjs +297 -0
- package/test/back/sock-security.test.cjs +72 -0
- package/test/back/ssh-config-home.test.cjs +113 -0
- package/test/back/start-env-preservation.test.cjs +53 -0
- package/test/back/static-mirror-trigger.test.cjs +441 -0
- package/test/back/static-mirror.test.cjs +179 -0
- package/test/back/stop-failure-feedback.test.cjs +158 -0
- package/test/back/stop-race.test.cjs +171 -0
- package/test/back/subscription-cleanup.test.cjs +53 -0
- package/test/back/subscription-mutation-lock.test.cjs +83 -0
- package/test/back/subscription-review-regression.test.cjs +607 -0
- package/test/back/subscription-stop-state.test.cjs +66 -0
- package/test/back/subscription-storage-regression.test.cjs +553 -0
- package/test/back/system-dependence-cache.test.cjs +127 -0
- package/test/back/system-export-history.test.cjs +119 -0
- package/test/back/systemTokenRenewal.test.cjs +497 -0
- package/test/back/task-shell-lifecycle.test.cjs +194 -0
- package/test/back/task-time.test.cjs +116 -0
- package/test/back/unique-constraint-error.test.cjs +72 -0
- package/test/back/upgrade-guards.test.cjs +285 -0
- package/test/back/upgrade-lifecycle.test.cjs +288 -0
- package/test/back/upgrade-transaction.test.cjs +133 -0
- package/test/back/user-api.test.cjs +99 -0
- package/test/back/user-security.test.cjs +349 -0
- package/test/back/worker-apm.test.cjs +84 -0
- package/test/back/wpush-grpc.test.cjs +116 -0
- package/test/fixtures/legacy-cron.json +1371 -0
- package/test/front/cron-log-pagination.test.cjs +214 -0
- package/test/front/diff-file-routing.test.cjs +126 -0
- package/test/front/http-auth.test.cjs +152 -0
- package/test/front/http-error.test.cjs +29 -0
- package/test/front/script-history-save.test.cjs +121 -0
- package/test/helpers/load-security-module.cjs +42 -0
- package/test/helpers/upgrade-fixture.cjs +30 -0
- package/version.yaml +14 -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/2096.6d98fd12.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/4859.6592cebb.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/6707.801b886b.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__diff__index.013b7c75.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__index.60b6f827.chunk.css +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/dist/{4859.1b962b29.chunk.css → 292.1b962b29.chunk.css} +0 -0
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
const test = require('node:test');
|
|
2
|
+
const assert = require('node:assert/strict');
|
|
3
|
+
const load = require('../helpers/load-security-module.cjs');
|
|
4
|
+
|
|
5
|
+
const logger = { info() {}, error() {} };
|
|
6
|
+
|
|
7
|
+
function cronFixture(killTask) {
|
|
8
|
+
const events = [];
|
|
9
|
+
const { runCron } = load('back/shared/runCron.ts', {
|
|
10
|
+
'cross-spawn': {
|
|
11
|
+
spawn: () => {
|
|
12
|
+
events.push('spawn');
|
|
13
|
+
return {};
|
|
14
|
+
},
|
|
15
|
+
},
|
|
16
|
+
'./childProcess': {
|
|
17
|
+
observeChildProcess: () => ({ completed: Promise.resolve({ code: 0 }) }),
|
|
18
|
+
asError: (e) => e,
|
|
19
|
+
},
|
|
20
|
+
'./pLimit': {
|
|
21
|
+
runWithCronLimit: async (_, fn) => fn(),
|
|
22
|
+
removeQueuedCron: () => events.push('release'),
|
|
23
|
+
},
|
|
24
|
+
'../loaders/logger': logger,
|
|
25
|
+
'../config/util': { killTask },
|
|
26
|
+
'../data/cron': {
|
|
27
|
+
CrontabModel: {
|
|
28
|
+
findOne: async () => ({
|
|
29
|
+
pid: 100,
|
|
30
|
+
status: 0,
|
|
31
|
+
allow_multiple_instances: 0,
|
|
32
|
+
}),
|
|
33
|
+
update: async () => events.push('idle'),
|
|
34
|
+
},
|
|
35
|
+
CrontabStatus: { running: 0, idle: 1, queued: 3 },
|
|
36
|
+
},
|
|
37
|
+
'../data/runningInstance': {
|
|
38
|
+
RunningInstanceModel: { update: async () => events.push('stopped') },
|
|
39
|
+
InstanceStatus: { running: 0, stopped: 2 },
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
return { run: () => runCron('ignored', { id: '1' }), events };
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
test('single-instance replacement does not spawn or finalize when termination fails', async () => {
|
|
46
|
+
const f = cronFixture(async () => {
|
|
47
|
+
throw Error('EPERM');
|
|
48
|
+
});
|
|
49
|
+
await f.run();
|
|
50
|
+
assert.deepEqual(f.events, ['release']);
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
test('single-instance replacement waits for verified exit before spawning', async () => {
|
|
54
|
+
let finish, entered, verified;
|
|
55
|
+
const pending = new Promise((resolve) => {
|
|
56
|
+
entered = resolve;
|
|
57
|
+
});
|
|
58
|
+
const gate = new Promise((resolve) => {
|
|
59
|
+
finish = resolve;
|
|
60
|
+
});
|
|
61
|
+
const f = cronFixture(async (pid, wait) => {
|
|
62
|
+
assert.equal(pid, 100);
|
|
63
|
+
verified = wait;
|
|
64
|
+
entered();
|
|
65
|
+
await gate;
|
|
66
|
+
});
|
|
67
|
+
const running = f.run();
|
|
68
|
+
await pending;
|
|
69
|
+
assert.deepEqual(f.events, []);
|
|
70
|
+
finish();
|
|
71
|
+
await running;
|
|
72
|
+
assert.equal(verified, true);
|
|
73
|
+
assert.deepEqual(f.events, ['stopped', 'idle', 'spawn', 'release']);
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
function subscriptionFixture(killTask) {
|
|
77
|
+
const updates = [];
|
|
78
|
+
const Service = load('back/services/subscription.ts', {
|
|
79
|
+
'../config': {},
|
|
80
|
+
'../data/cron': {},
|
|
81
|
+
'../config/const': {},
|
|
82
|
+
'../data/subscription': {
|
|
83
|
+
SubscriptionModel: {
|
|
84
|
+
findAll: async () => [
|
|
85
|
+
{ id: 1, pid: 101 },
|
|
86
|
+
{ id: 2, pid: 102 },
|
|
87
|
+
],
|
|
88
|
+
update: async (values, query) => updates.push({ values, query }),
|
|
89
|
+
},
|
|
90
|
+
SubscriptionStatus: { idle: 1 },
|
|
91
|
+
},
|
|
92
|
+
'../config/util': { killTask },
|
|
93
|
+
'../config/subscription': {},
|
|
94
|
+
'../shared/i18n': {},
|
|
95
|
+
'../shared/pLimit': {},
|
|
96
|
+
'../shared/logReader': {},
|
|
97
|
+
'../shared/logStreamManager': {},
|
|
98
|
+
'./schedule': {},
|
|
99
|
+
'./sock': {},
|
|
100
|
+
'./sshKey': {},
|
|
101
|
+
'./cron': {},
|
|
102
|
+
}).default;
|
|
103
|
+
return { service: new Service(logger, {}, {}, {}, {}), updates };
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
test('batch subscription stop preserves failed items and reports failure while stopping others', async () => {
|
|
107
|
+
const calls = [];
|
|
108
|
+
const denied = Error('EPERM');
|
|
109
|
+
const f = subscriptionFixture(async (pid, wait) => {
|
|
110
|
+
calls.push([pid, wait]);
|
|
111
|
+
if (pid === 101) throw denied;
|
|
112
|
+
});
|
|
113
|
+
await assert.rejects(f.service.stop([1, 2]), (e) => e === denied);
|
|
114
|
+
assert.deepEqual(calls, [
|
|
115
|
+
[101, true],
|
|
116
|
+
[102, true],
|
|
117
|
+
]);
|
|
118
|
+
assert.equal(f.updates.length, 1);
|
|
119
|
+
assert.equal(f.updates[0].query.where.id, 2);
|
|
120
|
+
assert.equal(f.updates[0].values.status, 1);
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
function scriptFixture(killTask, pid = 100) {
|
|
124
|
+
const Service = load('back/services/script.ts', {
|
|
125
|
+
'../config': { scriptPath: '/scripts' },
|
|
126
|
+
'../config/const': { TASK_COMMAND: 'task' },
|
|
127
|
+
'../config/util': { killTask, getPid: async () => pid },
|
|
128
|
+
'../shared/pLimit': { removeQueuedCron() {} },
|
|
129
|
+
'./sock': {},
|
|
130
|
+
'./cron': {},
|
|
131
|
+
'./schedule': {},
|
|
132
|
+
'../shared/fileAccess': {},
|
|
133
|
+
}).default;
|
|
134
|
+
return new Service(logger, {}, {}, {});
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
test('script stop propagates failure instead of returning success', async () => {
|
|
138
|
+
const denied = Error('EPERM');
|
|
139
|
+
const service = scriptFixture(async () => {
|
|
140
|
+
throw denied;
|
|
141
|
+
});
|
|
142
|
+
await assert.rejects(
|
|
143
|
+
service.stopScript('/scripts/test.js', 100),
|
|
144
|
+
(e) => e === denied,
|
|
145
|
+
);
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
test('script stop verifies exit and treats an absent queued process as already stopped', async () => {
|
|
149
|
+
const calls = [];
|
|
150
|
+
const service = scriptFixture(async (...args) => calls.push(args), undefined);
|
|
151
|
+
assert.equal((await service.stopScript('/scripts/test.js', 100)).code, 200);
|
|
152
|
+
assert.deepEqual(calls, [[100, true]]);
|
|
153
|
+
const absent = scriptFixture(async () => assert.fail('no PID to stop'), null);
|
|
154
|
+
assert.equal(
|
|
155
|
+
(await absent.stopScript('/scripts/test.js', undefined)).code,
|
|
156
|
+
200,
|
|
157
|
+
);
|
|
158
|
+
});
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
const test = require('node:test');
|
|
2
|
+
const assert = require('node:assert/strict');
|
|
3
|
+
const path = require('node:path');
|
|
4
|
+
const fs = require('node:fs');
|
|
5
|
+
const os = require('node:os');
|
|
6
|
+
const { Sequelize, DataTypes } = require('sequelize');
|
|
7
|
+
const load = require('../helpers/load-security-module.cjs');
|
|
8
|
+
async function fixture(t, onKill = async () => {}) {
|
|
9
|
+
const logPath = fs.mkdtempSync(path.join(os.tmpdir(), 'ql-stop-log-'));
|
|
10
|
+
t.after(() => fs.rmSync(logPath, { recursive: true, force: true }));
|
|
11
|
+
const db = new Sequelize({
|
|
12
|
+
dialect: 'sqlite',
|
|
13
|
+
storage: ':memory:',
|
|
14
|
+
logging: false,
|
|
15
|
+
});
|
|
16
|
+
t.after(() => db.close());
|
|
17
|
+
const crons = db.define('Cron', {
|
|
18
|
+
command: DataTypes.STRING,
|
|
19
|
+
status: DataTypes.INTEGER,
|
|
20
|
+
pid: DataTypes.INTEGER,
|
|
21
|
+
log_path: DataTypes.STRING,
|
|
22
|
+
queued_token: DataTypes.STRING,
|
|
23
|
+
last_execution_time: DataTypes.INTEGER,
|
|
24
|
+
last_running_time: DataTypes.INTEGER,
|
|
25
|
+
});
|
|
26
|
+
const instances = db.define('Instance', {
|
|
27
|
+
cron_id: DataTypes.INTEGER,
|
|
28
|
+
pid: DataTypes.INTEGER,
|
|
29
|
+
status: DataTypes.INTEGER,
|
|
30
|
+
exit_code: DataTypes.INTEGER,
|
|
31
|
+
finished_at: DataTypes.INTEGER,
|
|
32
|
+
});
|
|
33
|
+
await db.sync();
|
|
34
|
+
await crons.bulkCreate([
|
|
35
|
+
{ id: 1, command: 'task one.js', status: 0, pid: 101, log_path: 'one.log' },
|
|
36
|
+
{ id: 2, command: 'task two.js', status: 0, pid: 201, log_path: 'two.log' },
|
|
37
|
+
]);
|
|
38
|
+
await instances.bulkCreate([
|
|
39
|
+
{ id: 1, cron_id: 1, pid: 101, status: 0 },
|
|
40
|
+
{ id: 2, cron_id: 1, pid: 102, status: 0 },
|
|
41
|
+
{ id: 3, cron_id: 1, pid: 99, status: 1, exit_code: 0 },
|
|
42
|
+
{ id: 4, cron_id: 1, pid: 98, status: 3, exit_code: 7 },
|
|
43
|
+
{ id: 5, cron_id: 2, pid: 201, status: 0 },
|
|
44
|
+
]);
|
|
45
|
+
let service;
|
|
46
|
+
const killed = [];
|
|
47
|
+
const CronService = load(path.resolve('back/services/cron.ts'), {
|
|
48
|
+
'../config': { logPath },
|
|
49
|
+
'../data/cron': {
|
|
50
|
+
CrontabModel: crons,
|
|
51
|
+
CrontabStatus: { queued: 3, running: 0, idle: 1 },
|
|
52
|
+
},
|
|
53
|
+
'../data/runningInstance': {
|
|
54
|
+
RunningInstanceModel: instances,
|
|
55
|
+
InstanceStatus: { running: 0, finished: 1, stopped: 2, error: 3 },
|
|
56
|
+
},
|
|
57
|
+
'../config/util': {
|
|
58
|
+
killTask: async (pid, wait) => {
|
|
59
|
+
assert.equal(wait, true);
|
|
60
|
+
killed.push(pid);
|
|
61
|
+
await onKill({ pid, service, instances, crons });
|
|
62
|
+
},
|
|
63
|
+
killAllTasks: async () => {
|
|
64
|
+
throw Error('command-wide scans must not run');
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
'../config/const': {},
|
|
68
|
+
'../schedule/client': {},
|
|
69
|
+
'../shared/pLimit': {},
|
|
70
|
+
'../shared/utils': {},
|
|
71
|
+
'../shared/i18n': { t: (s) => s },
|
|
72
|
+
'../shared/logReader': {},
|
|
73
|
+
'../shared/logStreamManager': {},
|
|
74
|
+
'../shared/childProcess': require('../../back/shared/childProcess'),
|
|
75
|
+
}).default;
|
|
76
|
+
service = new CronService({ info() {}, error() {} });
|
|
77
|
+
service.getDb = ({ id }) => crons.findByPk(id);
|
|
78
|
+
return { service, instances, crons, killed };
|
|
79
|
+
}
|
|
80
|
+
async function report(service, pid, code) {
|
|
81
|
+
await service.status({
|
|
82
|
+
ids: [1],
|
|
83
|
+
status: 1,
|
|
84
|
+
pid,
|
|
85
|
+
log_path: 'one.log',
|
|
86
|
+
last_running_time: 1,
|
|
87
|
+
last_execution_time: 100,
|
|
88
|
+
exit_code: code,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
test('stop wins when shell exit writes error or success during termination, preserving exit codes', async (t) => {
|
|
92
|
+
const f = await fixture(t, async ({ service }) => {
|
|
93
|
+
await report(service, 101, 143);
|
|
94
|
+
await report(service, 102, 0);
|
|
95
|
+
});
|
|
96
|
+
await f.service.stop([1]);
|
|
97
|
+
const rows = await f.instances.findAll({ order: [['id', 'ASC']], raw: true });
|
|
98
|
+
assert.deepEqual(
|
|
99
|
+
rows.map((r) => [r.id, r.status, r.exit_code]),
|
|
100
|
+
[
|
|
101
|
+
[1, 2, 143],
|
|
102
|
+
[2, 2, 0],
|
|
103
|
+
[3, 1, 0],
|
|
104
|
+
[4, 3, 7],
|
|
105
|
+
[5, 0, null],
|
|
106
|
+
],
|
|
107
|
+
);
|
|
108
|
+
});
|
|
109
|
+
test('late shell completion cannot overwrite stopped instances', async (t) => {
|
|
110
|
+
const f = await fixture(t);
|
|
111
|
+
await f.service.stop([1]);
|
|
112
|
+
await report(f.service, 101, 143);
|
|
113
|
+
assert.equal((await f.instances.findByPk(1)).status, 2);
|
|
114
|
+
assert.equal((await f.instances.findByPk(2)).status, 2);
|
|
115
|
+
});
|
|
116
|
+
test('rows created after the stop snapshot are not relabelled', async (t) => {
|
|
117
|
+
const f = await fixture(t, async ({ instances }) => {
|
|
118
|
+
if (!(await instances.findByPk(6)))
|
|
119
|
+
await instances.create({ id: 6, cron_id: 1, pid: 103, status: 0 });
|
|
120
|
+
});
|
|
121
|
+
await f.service.stop([1]);
|
|
122
|
+
assert.equal((await f.instances.findByPk(6)).status, 0);
|
|
123
|
+
assert.equal((await f.instances.findByPk(1)).status, 2);
|
|
124
|
+
});
|
|
125
|
+
test('repeated stop does not rewrite historical rows or their finished timestamps', async (t) => {
|
|
126
|
+
const f = await fixture(t);
|
|
127
|
+
await f.service.stop([1]);
|
|
128
|
+
const before = await f.instances.findAll({
|
|
129
|
+
raw: true,
|
|
130
|
+
order: [['id', 'ASC']],
|
|
131
|
+
});
|
|
132
|
+
await f.service.stop([1]);
|
|
133
|
+
assert.deepEqual(
|
|
134
|
+
await f.instances.findAll({ raw: true, order: [['id', 'ASC']] }),
|
|
135
|
+
before,
|
|
136
|
+
);
|
|
137
|
+
});
|
|
138
|
+
test('batch stop captures running instances from every requested cron', async (t) => {
|
|
139
|
+
const f = await fixture(t);
|
|
140
|
+
await f.service.stop([1, 2]);
|
|
141
|
+
assert.equal((await f.instances.findByPk(5)).status, 2);
|
|
142
|
+
assert.equal((await f.instances.findByPk(3)).status, 1);
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
test('stop signals every snapshotted PID exactly once and preserves a later running instance', async (t) => {
|
|
146
|
+
const f = await fixture(t, async ({ instances, crons }) => {
|
|
147
|
+
if (!(await instances.findByPk(6))) {
|
|
148
|
+
await instances.create({ id: 6, cron_id: 1, pid: 103, status: 0 });
|
|
149
|
+
await crons.update(
|
|
150
|
+
{ pid: 103, log_path: 'later.log', status: 0 },
|
|
151
|
+
{ where: { id: 1 } },
|
|
152
|
+
);
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
await f.service.stop([1]);
|
|
156
|
+
assert.deepEqual(f.killed, [101, 102]);
|
|
157
|
+
assert.equal((await f.instances.findByPk(6)).status, 0);
|
|
158
|
+
assert.equal((await f.crons.findByPk(1)).pid, 103);
|
|
159
|
+
assert.equal((await f.crons.findByPk(1)).status, 0);
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
test('failed termination is not finalized as stopped', async (t) => {
|
|
163
|
+
const f = await fixture(t, async ({ pid }) => {
|
|
164
|
+
if (pid === 102) throw Error('still alive');
|
|
165
|
+
});
|
|
166
|
+
await f.service.stop([1]);
|
|
167
|
+
assert.deepEqual(f.killed, [101, 102]);
|
|
168
|
+
assert.equal((await f.instances.findByPk(1)).status, 2);
|
|
169
|
+
assert.equal((await f.instances.findByPk(2)).status, 0);
|
|
170
|
+
assert.equal((await f.crons.findByPk(1)).status, 0);
|
|
171
|
+
});
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
const assert = require('node:assert/strict');
|
|
2
|
+
const test = require('node:test');
|
|
3
|
+
const path = require('node:path');
|
|
4
|
+
const dayjs = require('dayjs');
|
|
5
|
+
const load = require('../helpers/load-security-module.cjs');
|
|
6
|
+
|
|
7
|
+
test('subscription becomes idle and closes its log even when completion logging fails', async () => {
|
|
8
|
+
const updates = [];
|
|
9
|
+
let closed = 0;
|
|
10
|
+
let notified = 0;
|
|
11
|
+
const Subscription = load(path.resolve('back/services/subscription.ts'), {
|
|
12
|
+
'../config': {},
|
|
13
|
+
'../data/subscription': {
|
|
14
|
+
SubscriptionModel: { update: async (values) => updates.push(values) },
|
|
15
|
+
SubscriptionStatus: { idle: 1 },
|
|
16
|
+
},
|
|
17
|
+
'../data/cron': {},
|
|
18
|
+
'../config/util': { handleLogPath: async () => '/tmp/unused-log' },
|
|
19
|
+
'../config/const': { LOG_END_SYMBOL: 'end' },
|
|
20
|
+
'../config/subscription': {},
|
|
21
|
+
'../shared/i18n': { t: (s) => s, tf: (s) => s },
|
|
22
|
+
'../shared/pLimit': {},
|
|
23
|
+
'../shared/logReader': {},
|
|
24
|
+
'../shared/logStreamManager': {
|
|
25
|
+
logStreamManager: {
|
|
26
|
+
write: async () => {
|
|
27
|
+
throw new Error('ENOSPC');
|
|
28
|
+
},
|
|
29
|
+
closeStream: async () => {
|
|
30
|
+
closed++;
|
|
31
|
+
throw new Error('ENOSPC');
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
'./schedule': {},
|
|
36
|
+
'./sock': {},
|
|
37
|
+
'./sshKey': {},
|
|
38
|
+
'./cron': {},
|
|
39
|
+
}).default;
|
|
40
|
+
const service = new Subscription(
|
|
41
|
+
{},
|
|
42
|
+
{},
|
|
43
|
+
{ sendMessage: () => notified++ },
|
|
44
|
+
{},
|
|
45
|
+
{},
|
|
46
|
+
);
|
|
47
|
+
service.getDb = async () => ({ id: 1, log_path: 'log' });
|
|
48
|
+
const callbacks = service.taskCallbacks({ id: 1 });
|
|
49
|
+
await assert.rejects(callbacks.onEnd(undefined, dayjs(), 1), /ENOSPC/);
|
|
50
|
+
assert.equal(closed, 1);
|
|
51
|
+
assert.equal(updates.at(-1).status, 1);
|
|
52
|
+
assert.equal(notified, 1);
|
|
53
|
+
});
|
|
@@ -0,0 +1,83 @@
|
|
|
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 { spawn } = require('node:child_process');
|
|
7
|
+
const load = require('../helpers/load-security-module.cjs');
|
|
8
|
+
|
|
9
|
+
function fixture(t) {
|
|
10
|
+
const root = fs.mkdtempSync(path.join(os.tmpdir(), 'ql-subscription-lock-'));
|
|
11
|
+
t.after(() => fs.rmSync(root, { recursive: true, force: true }));
|
|
12
|
+
const config = { scriptPath: path.join(root, 'scripts/') };
|
|
13
|
+
const { withSubscriptionMutation } = load(
|
|
14
|
+
'back/shared/subscriptionMutationLock.ts',
|
|
15
|
+
{ '../config': config },
|
|
16
|
+
);
|
|
17
|
+
return { root, config, withSubscriptionMutation };
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
test('subscription ownership mutations exclude a second process until cleanup completes', async (t) => {
|
|
21
|
+
const f = fixture(t);
|
|
22
|
+
let release, entered;
|
|
23
|
+
const gate = new Promise((resolve) => (release = resolve));
|
|
24
|
+
const held = new Promise((resolve) => (entered = resolve));
|
|
25
|
+
t.after(() => release());
|
|
26
|
+
const first = f.withSubscriptionMutation(async () => {
|
|
27
|
+
entered();
|
|
28
|
+
await gate;
|
|
29
|
+
});
|
|
30
|
+
await held;
|
|
31
|
+
const marker = path.join(f.root, 'second-writer');
|
|
32
|
+
const source = `
|
|
33
|
+
const load = require(${JSON.stringify(
|
|
34
|
+
path.resolve('test/helpers/load-security-module.cjs'),
|
|
35
|
+
)});
|
|
36
|
+
const { withSubscriptionMutation } = load(${JSON.stringify(
|
|
37
|
+
path.resolve('back/shared/subscriptionMutationLock.ts'),
|
|
38
|
+
)}, { '../config': ${JSON.stringify(f.config)} });
|
|
39
|
+
process.send('attempt');
|
|
40
|
+
withSubscriptionMutation(async () => require('fs').writeFileSync(${JSON.stringify(
|
|
41
|
+
marker,
|
|
42
|
+
)}, 'done'))
|
|
43
|
+
.then(() => process.exit(0), (error) => { console.error(error); process.exit(1); });
|
|
44
|
+
`;
|
|
45
|
+
const child = spawn(process.execPath, ['-e', source], {
|
|
46
|
+
stdio: ['ignore', 'ignore', 'pipe', 'ipc'],
|
|
47
|
+
});
|
|
48
|
+
t.after(() => child.kill());
|
|
49
|
+
let errors = '';
|
|
50
|
+
child.stderr.on('data', (chunk) => (errors += chunk));
|
|
51
|
+
const completed = new Promise((resolve, reject) => {
|
|
52
|
+
child.once('error', reject);
|
|
53
|
+
child.once('exit', (code) =>
|
|
54
|
+
code === 0
|
|
55
|
+
? resolve()
|
|
56
|
+
: reject(new Error(errors || `child exit ${code}`)),
|
|
57
|
+
);
|
|
58
|
+
});
|
|
59
|
+
await new Promise((resolve) => child.once('message', resolve));
|
|
60
|
+
await new Promise((resolve) => setTimeout(resolve, 150));
|
|
61
|
+
assert.equal(fs.existsSync(marker), false);
|
|
62
|
+
release();
|
|
63
|
+
await Promise.all([first, completed]);
|
|
64
|
+
assert.equal(fs.readFileSync(marker, 'utf8'), 'done');
|
|
65
|
+
assert.equal(
|
|
66
|
+
fs.existsSync(`${path.resolve(f.config.scriptPath)}.subscriptions.lock`),
|
|
67
|
+
false,
|
|
68
|
+
);
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
test('failed subscription mutations release the lock before the next operation', async (t) => {
|
|
72
|
+
const f = fixture(t);
|
|
73
|
+
await assert.rejects(
|
|
74
|
+
f.withSubscriptionMutation(async () => {
|
|
75
|
+
throw new Error('failed cleanup');
|
|
76
|
+
}),
|
|
77
|
+
/failed cleanup/,
|
|
78
|
+
);
|
|
79
|
+
assert.equal(
|
|
80
|
+
await f.withSubscriptionMutation(async () => 'next mutation'),
|
|
81
|
+
'next mutation',
|
|
82
|
+
);
|
|
83
|
+
});
|