Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f1d685b819 | |||
| 61c4aabba3 | |||
| f10a7847c2 | |||
| 3a39fbd65f | |||
| e208384d41 | |||
| c9d924811d | |||
| 9473924fcc | |||
| a0e7408c1a | |||
| 6e39b1db8f | |||
| ee4532221a |
43
changelog.md
43
changelog.md
@@ -1,5 +1,48 @@
|
||||
# Changelog
|
||||
|
||||
## 2025-09-03 - 5.10.2 - fix(processmonitor)
|
||||
Bump smartdaemon and stop aggressive pidusage cache clearing in ProcessMonitor
|
||||
|
||||
- Update dependency @push.rocks/smartdaemon from ^2.0.9 to ^2.1.0 in package.json.
|
||||
- Remove per-PID pidusage.clear calls in ts/daemon/processmonitor.ts (getProcessGroupStats) to avoid potential errors or unexpected behavior from manually clearing pidusage cache.
|
||||
|
||||
## 2025-09-03 - 5.10.1 - fix(processmonitor)
|
||||
Skip null pidusage entries when aggregating process-group memory/CPU to avoid errors
|
||||
|
||||
- Add defensive check for null/undefined entries returned by pidusage before accessing memory/cpu fields
|
||||
- Log a debug message when an individual process stat is null (process may have exited)
|
||||
- Improve robustness of ProcessMonitor.getProcessGroupStats to prevent runtime exceptions during aggregation
|
||||
|
||||
## 2025-09-01 - 5.10.0 - feat(daemon)
|
||||
Add crash log manager with rotation and integrate crash logging; improve IPC & process listener cleanup
|
||||
|
||||
- Introduce CrashLogManager to create formatted crash reports, persist them to disk and rotate old logs (max 100)
|
||||
- Persist recent process logs, include metadata (exit code, signal, restart attempts, memory) and human-readable sizes in crash reports
|
||||
- Integrate crash logging into ProcessMonitor: save crash logs on non-zero exits and errors, and persist/rotate logs
|
||||
- Improve ProcessMonitor and ProcessWrapper by tracking and removing event listeners to avoid memory leaks
|
||||
- Clear pidusage cache more aggressively to prevent stale entries
|
||||
- Enhance TspmIpcClient to store/remove lifecycle event handlers on disconnect to avoid dangling listeners
|
||||
- Add tests and utilities: test/test.crashlog.direct.ts, test/test.crashlog.manual.ts and test/test.crashlog.ts to validate crash log creation and rotation
|
||||
|
||||
## 2025-08-31 - 5.9.0 - feat(cli)
|
||||
Add interactive edit flow to CLI and improve UX
|
||||
|
||||
- Add -i / --interactive flag to tspm add to open an interactive editor immediately after adding a process
|
||||
- Implement interactiveEditProcess helper (smartinteract-based) to provide interactive editing for process configs
|
||||
- Enable tspm edit to launch the interactive editor (replaces prior placeholder flow)
|
||||
- Improve user-facing message when no processes are configured in tspm list
|
||||
- Lower verbosity for missing saved configs on daemon startup (changed logger.info → logger.debug)
|
||||
|
||||
## 2025-08-31 - 5.8.0 - feat(core)
|
||||
Add core TypeScript TSPM implementation: CLI, daemon, client, process management and tests
|
||||
|
||||
- Add CLI entrypoint and command set (start/stop/add/list/logs/daemon/service/stats/reset and batch ops)
|
||||
- Add daemon implementation with ProcessManager, ProcessMonitor, ProcessWrapper, LogPersistence and config storage
|
||||
- Add IPC client (tspmIpcClient) and TspmServiceManager for systemd integration using smartipc/smartdaemon
|
||||
- Introduce shared protocol types, process ID helpers and standardized error codes for stable IPC
|
||||
- Include tests and test assets for daemon, integration and IPC client scenarios
|
||||
- Add README and package metadata (package.json, npmextra.json, commitinfo)
|
||||
|
||||
## 2025-08-31 - 5.7.0 - feat(cli)
|
||||
Add 'stats' CLI command and daemon stats aggregation; fix process manager & wrapper state handling
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@git.zone/tspm",
|
||||
"version": "5.7.0",
|
||||
"version": "5.10.2",
|
||||
"private": false,
|
||||
"description": "a no fuzz process manager",
|
||||
"main": "dist_ts/index.js",
|
||||
@@ -35,7 +35,7 @@
|
||||
"@push.rocks/npmextra": "^5.3.3",
|
||||
"@push.rocks/projectinfo": "^5.0.2",
|
||||
"@push.rocks/smartcli": "^4.0.11",
|
||||
"@push.rocks/smartdaemon": "^2.0.9",
|
||||
"@push.rocks/smartdaemon": "^2.1.0",
|
||||
"@push.rocks/smartfile": "^11.2.7",
|
||||
"@push.rocks/smartinteract": "^2.0.16",
|
||||
"@push.rocks/smartipc": "^2.3.0",
|
||||
|
||||
122
pnpm-lock.yaml
generated
122
pnpm-lock.yaml
generated
@@ -18,8 +18,8 @@ importers:
|
||||
specifier: ^4.0.11
|
||||
version: 4.0.11
|
||||
'@push.rocks/smartdaemon':
|
||||
specifier: ^2.0.9
|
||||
version: 2.0.9
|
||||
specifier: ^2.1.0
|
||||
version: 2.1.0
|
||||
'@push.rocks/smartfile':
|
||||
specifier: ^11.2.7
|
||||
version: 11.2.7
|
||||
@@ -826,8 +826,8 @@ packages:
|
||||
'@push.rocks/smartcrypto@2.0.4':
|
||||
resolution: {integrity: sha512-1+/5bsjyataf5uUkUNnnVXGRAt+gHVk1KDzozjTqgqJxHvQk1d9fVDohL6CxUhUucTPtu5VR5xNBiV8YCDuGyw==}
|
||||
|
||||
'@push.rocks/smartdaemon@2.0.9':
|
||||
resolution: {integrity: sha512-TJd2N/vMAY3qpuy7ub0btNsSqdy7oU/hF/D+BbmfJVAiTKpvlgtCXKE5POwfuee03SONyh8LuH5Ey1ycIpsEHA==}
|
||||
'@push.rocks/smartdaemon@2.1.0':
|
||||
resolution: {integrity: sha512-cxc05jvA/frb3rJ5EdQkkfbJXiFC33u57LmOaBye6Hynj4w/ZZjph7WLAkp6Yx8+75Ldajm6LXIRxn91+RbDeQ==}
|
||||
|
||||
'@push.rocks/smartdata@5.16.4':
|
||||
resolution: {integrity: sha512-COiKw8yk9iAcLN44WmZHG8Gi0v+HGkgM8Osoq7Cns+UsOA+grPepqbN2r0XPG1fm5vOdJcaydi2ZU0xrnbGVvQ==}
|
||||
@@ -898,6 +898,9 @@ packages:
|
||||
'@push.rocks/smartlog@3.1.8':
|
||||
resolution: {integrity: sha512-j4H5x4/hEmiIO7q+/LKyX3N+AhRIOj1jDE4TvZDvujZkbT/9wEWfpO1bqeMe/EQbg1eOQMlAuyrcLXUcDICpQg==}
|
||||
|
||||
'@push.rocks/smartlog@3.1.9':
|
||||
resolution: {integrity: sha512-Lix1pazMhvnSUyj4Bt+pO+SvImw3l0dm5A0LTTx/QaSlWP8bpAQNQ+8z7wfQy3pIKFHkApxvGM6WprgCCS2itQ==}
|
||||
|
||||
'@push.rocks/smartmanifest@2.0.2':
|
||||
resolution: {integrity: sha512-QGc5C9vunjfUbYsPGz5bynV/mVmPHkrQDkWp8ZO8VJtK1GZe+njgbrNyxn2SUHR0IhSAbSXl1j4JvBqYf5eTVg==}
|
||||
|
||||
@@ -1270,8 +1273,8 @@ packages:
|
||||
resolution: {integrity: sha512-EYqsIYJmkR1VhVE9pccnk353xhs+lB6btdutJEtsp7R055haMJp2yE16eSxw8fv+G0WUY6vqxyYOP8kOqawxYQ==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/core@3.9.0':
|
||||
resolution: {integrity: sha512-B/GknvCfS3llXd/b++hcrwIuqnEozQDnRL4sBmOac5/z/dr0/yG1PURNPOyU4Lsiy1IyTj8scPxVqRs5dYWf6A==}
|
||||
'@smithy/core@3.9.1':
|
||||
resolution: {integrity: sha512-E3erEn1SjPq8P9w2fPlp1+slaq6FlrRKlsaLCo0aPMY2j94lwZlwz1yqY4yDeX3+ViG+sOEPPRBZGfdciMtABA==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/credential-provider-imds@4.0.7':
|
||||
@@ -1338,16 +1341,16 @@ packages:
|
||||
resolution: {integrity: sha512-ZhvqcVRPZxnZlokcPaTwb+r+h4yOIOCJmx0v2d1bpVlmP465g3qpVSf7wxcq5zZdu4jb0H4yIMxuPwDJSQc3MQ==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/middleware-endpoint@4.1.19':
|
||||
resolution: {integrity: sha512-EAlEPncqo03siNZJ9Tm6adKCQ+sw5fNU8ncxWwaH0zTCwMPsgmERTi6CEKaermZdgJb+4Yvh0NFm36HeO4PGgQ==}
|
||||
'@smithy/middleware-endpoint@4.1.20':
|
||||
resolution: {integrity: sha512-6jwjI4l9LkpEN/77ylyWsA6o81nKSIj8itRjtPpVqYSf+q8b12uda0Upls5CMSDXoL/jY2gPsNj+/Tg3gbYYew==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/middleware-retry@4.1.19':
|
||||
resolution: {integrity: sha512-X58zx/NVECjeuUB6A8HBu4bhx72EoUz+T5jTMIyeNKx2lf+Gs9TmWPNNkH+5QF0COjpInP/xSpJGJ7xEnAklQQ==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/middleware-retry@4.1.20':
|
||||
resolution: {integrity: sha512-T3maNEm3Masae99eFdx1Q7PIqBBEVOvRd5hralqKZNeIivnoGNx5OFtI3DiZ5gCjUkl0mNondlzSXeVxkinh7Q==}
|
||||
'@smithy/middleware-retry@4.1.21':
|
||||
resolution: {integrity: sha512-oFpp+4JfNef0Mp2Jw8wIl1jVxjhUU3jFZkk3UTqBtU5Xp6/ahTu6yo1EadWNPAnCjKTo8QB6Q+SObX97xfMUtA==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/middleware-serde@4.0.9':
|
||||
@@ -1398,8 +1401,8 @@ packages:
|
||||
resolution: {integrity: sha512-iW6HjXqN0oPtRS0NK/zzZ4zZeGESIFcxj2FkWed3mcK8jdSdHzvnCKXSjvewESKAgGKAbJRA+OsaqKhkdYRbQQ==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/smithy-client@4.5.0':
|
||||
resolution: {integrity: sha512-ZSdE3vl0MuVbEwJBxSftm0J5nL/gw76xp5WF13zW9cN18MFuFXD5/LV0QD8P+sCU5bSWGyy6CTgUupE1HhOo1A==}
|
||||
'@smithy/smithy-client@4.5.1':
|
||||
resolution: {integrity: sha512-PuvtnQgwpy3bb56YvHAP7eRwp862yJxtQno40UX9kTjjkgTlo//ov+e1IVCFTiELcAOiqF2++Y0e7eH/Zgv5Vw==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/types@4.3.2':
|
||||
@@ -1438,16 +1441,16 @@ packages:
|
||||
resolution: {integrity: sha512-xgl75aHIS/3rrGp7iTxQAOELYeyiwBu+eEgAk4xfKwJJ0L8VUjhO2shsDpeil54BOFsqmk5xfdesiewbUY5tKQ==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/util-defaults-mode-browser@4.0.27':
|
||||
resolution: {integrity: sha512-i/Fu6AFT5014VJNgWxKomBJP/GB5uuOsM4iHdcmplLm8B1eAqnRItw4lT2qpdO+mf+6TFmf6dGcggGLAVMZJsQ==}
|
||||
'@smithy/util-defaults-mode-browser@4.0.28':
|
||||
resolution: {integrity: sha512-83Iqb9c443d8S/9PD6Bb770Q3ZvCenfgJDoR98iveI+zKpu6d4mOVS2RKBU9Z4VQPbRcrRj71SY0kZePGh+wZg==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/util-defaults-mode-node@4.0.26':
|
||||
resolution: {integrity: sha512-z81yyIkGiLLYVDetKTUeCZQ8x20EEzvQjrqJtb/mXnevLq2+w3XCEWTJ2pMp401b6BkEkHVfXb/cROBpVauLMQ==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/util-defaults-mode-node@4.0.27':
|
||||
resolution: {integrity: sha512-3W0qClMyxl/ELqTA39aNw1N+pN0IjpXT7lPFvZ8zTxqVFP7XCpACB9QufmN4FQtd39xbgS7/Lekn7LmDa63I5w==}
|
||||
'@smithy/util-defaults-mode-node@4.0.28':
|
||||
resolution: {integrity: sha512-LzklW4HepBM198vH0C3v+WSkMHOkxu7axCEqGoKdICz3RHLq+mDs2AkDDXVtB61+SHWoiEsc6HOObzVQbNLO0Q==}
|
||||
engines: {node: '>=18.0.0'}
|
||||
|
||||
'@smithy/util-endpoints@3.0.7':
|
||||
@@ -4681,26 +4684,26 @@ snapshots:
|
||||
'@aws-sdk/util-user-agent-browser': 3.734.0
|
||||
'@aws-sdk/util-user-agent-node': 3.758.0
|
||||
'@smithy/config-resolver': 4.1.5
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/fetch-http-handler': 5.1.1
|
||||
'@smithy/hash-node': 4.0.5
|
||||
'@smithy/invalid-dependency': 4.0.5
|
||||
'@smithy/middleware-content-length': 4.0.5
|
||||
'@smithy/middleware-endpoint': 4.1.19
|
||||
'@smithy/middleware-retry': 4.1.20
|
||||
'@smithy/middleware-endpoint': 4.1.20
|
||||
'@smithy/middleware-retry': 4.1.21
|
||||
'@smithy/middleware-serde': 4.0.9
|
||||
'@smithy/middleware-stack': 4.0.5
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/node-http-handler': 4.1.1
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
'@smithy/url-parser': 4.0.5
|
||||
'@smithy/util-base64': 4.0.0
|
||||
'@smithy/util-body-length-browser': 4.0.0
|
||||
'@smithy/util-body-length-node': 4.0.0
|
||||
'@smithy/util-defaults-mode-browser': 4.0.27
|
||||
'@smithy/util-defaults-mode-node': 4.0.27
|
||||
'@smithy/util-defaults-mode-browser': 4.0.28
|
||||
'@smithy/util-defaults-mode-node': 4.0.28
|
||||
'@smithy/util-endpoints': 3.0.7
|
||||
'@smithy/util-middleware': 4.0.5
|
||||
'@smithy/util-retry': 4.0.7
|
||||
@@ -4788,26 +4791,26 @@ snapshots:
|
||||
'@aws-sdk/util-user-agent-browser': 3.734.0
|
||||
'@aws-sdk/util-user-agent-node': 3.758.0
|
||||
'@smithy/config-resolver': 4.1.5
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/fetch-http-handler': 5.1.1
|
||||
'@smithy/hash-node': 4.0.5
|
||||
'@smithy/invalid-dependency': 4.0.5
|
||||
'@smithy/middleware-content-length': 4.0.5
|
||||
'@smithy/middleware-endpoint': 4.1.19
|
||||
'@smithy/middleware-retry': 4.1.20
|
||||
'@smithy/middleware-endpoint': 4.1.20
|
||||
'@smithy/middleware-retry': 4.1.21
|
||||
'@smithy/middleware-serde': 4.0.9
|
||||
'@smithy/middleware-stack': 4.0.5
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/node-http-handler': 4.1.1
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
'@smithy/url-parser': 4.0.5
|
||||
'@smithy/util-base64': 4.0.0
|
||||
'@smithy/util-body-length-browser': 4.0.0
|
||||
'@smithy/util-body-length-node': 4.0.0
|
||||
'@smithy/util-defaults-mode-browser': 4.0.27
|
||||
'@smithy/util-defaults-mode-node': 4.0.27
|
||||
'@smithy/util-defaults-mode-browser': 4.0.28
|
||||
'@smithy/util-defaults-mode-node': 4.0.28
|
||||
'@smithy/util-endpoints': 3.0.7
|
||||
'@smithy/util-middleware': 4.0.5
|
||||
'@smithy/util-retry': 4.0.7
|
||||
@@ -4863,12 +4866,12 @@ snapshots:
|
||||
'@aws-sdk/core@3.758.0':
|
||||
dependencies:
|
||||
'@aws-sdk/types': 3.734.0
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/property-provider': 4.0.5
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/signature-v4': 5.1.3
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
'@smithy/util-middleware': 4.0.5
|
||||
fast-xml-parser: 4.4.1
|
||||
@@ -4929,7 +4932,7 @@ snapshots:
|
||||
'@smithy/node-http-handler': 4.1.1
|
||||
'@smithy/property-provider': 4.0.5
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
'@smithy/util-stream': 4.2.4
|
||||
tslib: 2.8.1
|
||||
@@ -5103,7 +5106,7 @@ snapshots:
|
||||
'@aws-sdk/credential-provider-web-identity': 3.758.0
|
||||
'@aws-sdk/nested-clients': 3.758.0
|
||||
'@aws-sdk/types': 3.734.0
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/credential-provider-imds': 4.0.7
|
||||
'@smithy/property-provider': 4.0.5
|
||||
'@smithy/types': 4.3.2
|
||||
@@ -5222,7 +5225,7 @@ snapshots:
|
||||
'@aws-sdk/core': 3.758.0
|
||||
'@aws-sdk/types': 3.734.0
|
||||
'@aws-sdk/util-endpoints': 3.743.0
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/types': 4.3.2
|
||||
tslib: 2.8.1
|
||||
@@ -5253,26 +5256,26 @@ snapshots:
|
||||
'@aws-sdk/util-user-agent-browser': 3.734.0
|
||||
'@aws-sdk/util-user-agent-node': 3.758.0
|
||||
'@smithy/config-resolver': 4.1.5
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/fetch-http-handler': 5.1.1
|
||||
'@smithy/hash-node': 4.0.5
|
||||
'@smithy/invalid-dependency': 4.0.5
|
||||
'@smithy/middleware-content-length': 4.0.5
|
||||
'@smithy/middleware-endpoint': 4.1.19
|
||||
'@smithy/middleware-retry': 4.1.20
|
||||
'@smithy/middleware-endpoint': 4.1.20
|
||||
'@smithy/middleware-retry': 4.1.21
|
||||
'@smithy/middleware-serde': 4.0.9
|
||||
'@smithy/middleware-stack': 4.0.5
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/node-http-handler': 4.1.1
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
'@smithy/url-parser': 4.0.5
|
||||
'@smithy/util-base64': 4.0.0
|
||||
'@smithy/util-body-length-browser': 4.0.0
|
||||
'@smithy/util-body-length-node': 4.0.0
|
||||
'@smithy/util-defaults-mode-browser': 4.0.27
|
||||
'@smithy/util-defaults-mode-node': 4.0.27
|
||||
'@smithy/util-defaults-mode-browser': 4.0.28
|
||||
'@smithy/util-defaults-mode-node': 4.0.28
|
||||
'@smithy/util-endpoints': 3.0.7
|
||||
'@smithy/util-middleware': 4.0.5
|
||||
'@smithy/util-retry': 4.0.7
|
||||
@@ -6219,12 +6222,12 @@ snapshots:
|
||||
'@types/node-forge': 1.3.14
|
||||
node-forge: 1.3.1
|
||||
|
||||
'@push.rocks/smartdaemon@2.0.9':
|
||||
'@push.rocks/smartdaemon@2.1.0':
|
||||
dependencies:
|
||||
'@push.rocks/lik': 6.2.2
|
||||
'@push.rocks/smartfile': 11.2.7
|
||||
'@push.rocks/smartfm': 2.2.2
|
||||
'@push.rocks/smartlog': 3.1.8
|
||||
'@push.rocks/smartlog': 3.1.9
|
||||
'@push.rocks/smartlog-destination-local': 9.0.2
|
||||
'@push.rocks/smartpath': 6.0.0
|
||||
'@push.rocks/smartshell': 3.3.0
|
||||
@@ -6405,6 +6408,19 @@ snapshots:
|
||||
'@push.rocks/webrequest': 3.0.37
|
||||
'@tsclass/tsclass': 9.2.0
|
||||
|
||||
'@push.rocks/smartlog@3.1.9':
|
||||
dependencies:
|
||||
'@api.global/typedrequest-interfaces': 3.0.19
|
||||
'@push.rocks/consolecolor': 2.0.3
|
||||
'@push.rocks/isounique': 1.0.5
|
||||
'@push.rocks/smartclickhouse': 2.0.17
|
||||
'@push.rocks/smartfile': 11.2.7
|
||||
'@push.rocks/smarthash': 3.2.3
|
||||
'@push.rocks/smartpromise': 4.2.3
|
||||
'@push.rocks/smarttime': 4.1.1
|
||||
'@push.rocks/webrequest': 3.0.37
|
||||
'@tsclass/tsclass': 9.2.0
|
||||
|
||||
'@push.rocks/smartmanifest@2.0.2': {}
|
||||
|
||||
'@push.rocks/smartmarkdown@3.0.3':
|
||||
@@ -7055,7 +7071,7 @@ snapshots:
|
||||
tslib: 2.8.1
|
||||
uuid: 9.0.1
|
||||
|
||||
'@smithy/core@3.9.0':
|
||||
'@smithy/core@3.9.1':
|
||||
dependencies:
|
||||
'@smithy/middleware-serde': 4.0.9
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
@@ -7172,9 +7188,9 @@ snapshots:
|
||||
'@smithy/util-middleware': 4.0.5
|
||||
tslib: 2.8.1
|
||||
|
||||
'@smithy/middleware-endpoint@4.1.19':
|
||||
'@smithy/middleware-endpoint@4.1.20':
|
||||
dependencies:
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/middleware-serde': 4.0.9
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/shared-ini-file-loader': 4.0.5
|
||||
@@ -7197,12 +7213,12 @@ snapshots:
|
||||
tslib: 2.8.1
|
||||
uuid: 9.0.1
|
||||
|
||||
'@smithy/middleware-retry@4.1.20':
|
||||
'@smithy/middleware-retry@4.1.21':
|
||||
dependencies:
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/service-error-classification': 4.0.7
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
'@smithy/util-middleware': 4.0.5
|
||||
'@smithy/util-retry': 4.0.7
|
||||
@@ -7288,10 +7304,10 @@ snapshots:
|
||||
'@smithy/util-stream': 4.2.4
|
||||
tslib: 2.8.1
|
||||
|
||||
'@smithy/smithy-client@4.5.0':
|
||||
'@smithy/smithy-client@4.5.1':
|
||||
dependencies:
|
||||
'@smithy/core': 3.9.0
|
||||
'@smithy/middleware-endpoint': 4.1.19
|
||||
'@smithy/core': 3.9.1
|
||||
'@smithy/middleware-endpoint': 4.1.20
|
||||
'@smithy/middleware-stack': 4.0.5
|
||||
'@smithy/protocol-http': 5.1.3
|
||||
'@smithy/types': 4.3.2
|
||||
@@ -7345,10 +7361,10 @@ snapshots:
|
||||
bowser: 2.12.1
|
||||
tslib: 2.8.1
|
||||
|
||||
'@smithy/util-defaults-mode-browser@4.0.27':
|
||||
'@smithy/util-defaults-mode-browser@4.0.28':
|
||||
dependencies:
|
||||
'@smithy/property-provider': 4.0.5
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
bowser: 2.12.1
|
||||
tslib: 2.8.1
|
||||
@@ -7364,13 +7380,13 @@ snapshots:
|
||||
'@smithy/types': 4.3.2
|
||||
tslib: 2.8.1
|
||||
|
||||
'@smithy/util-defaults-mode-node@4.0.27':
|
||||
'@smithy/util-defaults-mode-node@4.0.28':
|
||||
dependencies:
|
||||
'@smithy/config-resolver': 4.1.5
|
||||
'@smithy/credential-provider-imds': 4.0.7
|
||||
'@smithy/node-config-provider': 4.1.4
|
||||
'@smithy/property-provider': 4.0.5
|
||||
'@smithy/smithy-client': 4.5.0
|
||||
'@smithy/smithy-client': 4.5.1
|
||||
'@smithy/types': 4.3.2
|
||||
tslib: 2.8.1
|
||||
optional: true
|
||||
|
||||
@@ -72,6 +72,7 @@ Add a new process configuration without starting it. This is the recommended way
|
||||
- `--watch` - Enable file watching for auto-restart
|
||||
- `--watch-paths <paths>` - Comma-separated paths to watch
|
||||
- `--autorestart` - Auto-restart on crash (default: true)
|
||||
- `-i, --interactive` - Enter interactive edit mode after adding
|
||||
|
||||
**Examples:**
|
||||
```bash
|
||||
@@ -86,6 +87,9 @@ tspm add "tsx watch src/index.ts" --name dev-server --watch --watch-paths "src,c
|
||||
|
||||
# Add without auto-restart
|
||||
tspm add "node worker.js" --name one-time-job --autorestart false
|
||||
|
||||
# Add and immediately edit interactively
|
||||
tspm add "node server.js" --name api -i
|
||||
```
|
||||
|
||||
#### `tspm start <id|id:N|name:LABEL>`
|
||||
|
||||
148
test/test.crashlog.direct.ts
Normal file
148
test/test.crashlog.direct.ts
Normal file
@@ -0,0 +1,148 @@
|
||||
#!/usr/bin/env tsx
|
||||
|
||||
import { CrashLogManager } from '../ts/daemon/crashlogmanager.js';
|
||||
import type { IProcessLog } from '../ts/shared/protocol/ipc.types.js';
|
||||
import * as plugins from '../ts/plugins.js';
|
||||
import * as paths from '../ts/paths.js';
|
||||
import * as fs from 'fs/promises';
|
||||
|
||||
async function testCrashLogManager() {
|
||||
console.log('🧪 Testing CrashLogManager directly...\n');
|
||||
|
||||
const crashLogManager = new CrashLogManager();
|
||||
const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
|
||||
|
||||
// Clean up any existing crash logs
|
||||
console.log('📁 Cleaning up existing crash logs...');
|
||||
try {
|
||||
await fs.rm(crashLogsDir, { recursive: true, force: true });
|
||||
} catch {}
|
||||
|
||||
// Create test logs
|
||||
const testLogs: IProcessLog[] = [
|
||||
{
|
||||
timestamp: Date.now() - 5000,
|
||||
message: '[TEST] Process starting up...',
|
||||
type: 'stdout'
|
||||
},
|
||||
{
|
||||
timestamp: Date.now() - 4000,
|
||||
message: '[TEST] Initializing components...',
|
||||
type: 'stdout'
|
||||
},
|
||||
{
|
||||
timestamp: Date.now() - 3000,
|
||||
message: '[TEST] Running main loop...',
|
||||
type: 'stdout'
|
||||
},
|
||||
{
|
||||
timestamp: Date.now() - 2000,
|
||||
message: '[TEST] Warning: Memory usage high',
|
||||
type: 'stderr'
|
||||
},
|
||||
{
|
||||
timestamp: Date.now() - 1000,
|
||||
message: '[TEST] Error: Unhandled exception occurred!',
|
||||
type: 'stderr'
|
||||
},
|
||||
{
|
||||
timestamp: Date.now() - 500,
|
||||
message: '[TEST] Fatal: Process crashing with exit code 42',
|
||||
type: 'stderr'
|
||||
}
|
||||
];
|
||||
|
||||
// Test saving a crash log
|
||||
console.log('💾 Saving crash log...');
|
||||
await crashLogManager.saveCrashLog(
|
||||
1 as any, // ProcessId
|
||||
'test-process',
|
||||
testLogs,
|
||||
42, // exit code
|
||||
null, // signal
|
||||
3, // restart count
|
||||
1024 * 1024 * 50 // 50MB memory usage
|
||||
);
|
||||
|
||||
// Check if crash log was created
|
||||
console.log('🔍 Checking for crash log...');
|
||||
const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
|
||||
console.log(` Found ${crashLogFiles.length} crash log files:`);
|
||||
crashLogFiles.forEach(file => console.log(` - ${file}`));
|
||||
|
||||
if (crashLogFiles.length === 0) {
|
||||
console.error('❌ No crash logs were created!');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// Read and display the crash log
|
||||
const crashLogFile = crashLogFiles[0];
|
||||
const crashLogPath = plugins.path.join(crashLogsDir, crashLogFile);
|
||||
const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
|
||||
|
||||
console.log('\n📋 Crash log content:');
|
||||
console.log('─'.repeat(60));
|
||||
console.log(crashLogContent);
|
||||
console.log('─'.repeat(60));
|
||||
|
||||
// Verify content
|
||||
const checks = [
|
||||
{ text: 'CRASH REPORT', found: crashLogContent.includes('CRASH REPORT') },
|
||||
{ text: 'Exit Code: 42', found: crashLogContent.includes('Exit Code: 42') },
|
||||
{ text: 'Restart Attempt: 3/10', found: crashLogContent.includes('Restart Attempt: 3/10') },
|
||||
{ text: 'Memory Usage: 50 MB', found: crashLogContent.includes('Memory Usage: 50 MB') },
|
||||
{ text: 'Fatal: Process crashing', found: crashLogContent.includes('Fatal: Process crashing') }
|
||||
];
|
||||
|
||||
console.log('\n✅ Verification:');
|
||||
checks.forEach(check => {
|
||||
console.log(` ${check.found ? '✓' : '✗'} Contains "${check.text}"`);
|
||||
});
|
||||
|
||||
const allChecksPassed = checks.every(c => c.found);
|
||||
|
||||
// Test rotation (create 100+ logs to test limit)
|
||||
console.log('\n🔄 Testing rotation (creating 105 crash logs)...');
|
||||
for (let i = 2; i <= 105; i++) {
|
||||
await crashLogManager.saveCrashLog(
|
||||
i as any,
|
||||
`test-process-${i}`,
|
||||
testLogs,
|
||||
i,
|
||||
null,
|
||||
1,
|
||||
1024 * 1024 * 10
|
||||
);
|
||||
// Small delay to ensure different timestamps
|
||||
await new Promise(resolve => setTimeout(resolve, 10));
|
||||
}
|
||||
|
||||
// Check that we have exactly 100 logs (rotation working)
|
||||
const finalLogFiles = await fs.readdir(crashLogsDir);
|
||||
console.log(` After rotation: ${finalLogFiles.length} crash logs (should be 100)`);
|
||||
|
||||
if (finalLogFiles.length !== 100) {
|
||||
console.error(`❌ Rotation failed! Expected 100 logs, got ${finalLogFiles.length}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// Verify oldest logs were deleted (test-process should be gone)
|
||||
const hasOriginal = finalLogFiles.some(f => f.includes('_1_test-process.log'));
|
||||
if (hasOriginal) {
|
||||
console.error('❌ Rotation failed! Oldest log still exists');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (allChecksPassed) {
|
||||
console.log('\n✅ All crash log tests passed!');
|
||||
} else {
|
||||
console.log('\n❌ Some crash log tests failed!');
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Run the test
|
||||
testCrashLogManager().catch(error => {
|
||||
console.error('❌ Test failed:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
137
test/test.crashlog.manual.ts
Normal file
137
test/test.crashlog.manual.ts
Normal file
@@ -0,0 +1,137 @@
|
||||
#!/usr/bin/env tsx
|
||||
|
||||
import * as plugins from '../ts/plugins.js';
|
||||
import * as paths from '../ts/paths.js';
|
||||
import * as fs from 'fs/promises';
|
||||
import { execSync } from 'child_process';
|
||||
|
||||
// Test process that will crash
|
||||
const CRASH_SCRIPT = `
|
||||
setInterval(() => {
|
||||
console.log('[test] Process is running...');
|
||||
}, 1000);
|
||||
|
||||
setTimeout(() => {
|
||||
console.error('[test] About to crash with non-zero exit code!');
|
||||
process.exit(42);
|
||||
}, 3000);
|
||||
`;
|
||||
|
||||
async function testCrashLog() {
|
||||
console.log('🧪 Testing crash log functionality...\n');
|
||||
|
||||
const crashScriptPath = plugins.path.join(paths.tspmDir, 'test-crash-script.js');
|
||||
const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
|
||||
|
||||
try {
|
||||
// Clean up any existing crash logs
|
||||
console.log('📁 Cleaning up existing crash logs...');
|
||||
try {
|
||||
await fs.rm(crashLogsDir, { recursive: true, force: true });
|
||||
} catch {}
|
||||
|
||||
// Write the crash script
|
||||
console.log('📝 Writing test crash script...');
|
||||
await fs.writeFile(crashScriptPath, CRASH_SCRIPT);
|
||||
|
||||
// Stop any existing daemon
|
||||
console.log('🛑 Stopping any existing daemon...');
|
||||
try {
|
||||
execSync('tsx ts/cli.ts daemon stop', { stdio: 'inherit' });
|
||||
} catch {}
|
||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||
|
||||
// Start the daemon
|
||||
console.log('🚀 Starting daemon...');
|
||||
execSync('tsx ts/cli.ts daemon start', { stdio: 'inherit' });
|
||||
await new Promise(resolve => setTimeout(resolve, 2000));
|
||||
|
||||
// Add a process that will crash
|
||||
console.log('➕ Adding crash test process...');
|
||||
const addOutput = execSync(`tsx ts/cli.ts add "node ${crashScriptPath}" --name crash-test`, { encoding: 'utf-8' });
|
||||
console.log(addOutput);
|
||||
|
||||
// Extract process ID from output
|
||||
const idMatch = addOutput.match(/Process added with ID: (\d+)/);
|
||||
if (!idMatch) {
|
||||
throw new Error('Could not extract process ID from output');
|
||||
}
|
||||
const processId = parseInt(idMatch[1]);
|
||||
console.log(` Process ID: ${processId}`);
|
||||
|
||||
// Start the process
|
||||
console.log('▶️ Starting process that will crash...');
|
||||
execSync(`tsx ts/cli.ts start ${processId}`, { stdio: 'inherit' });
|
||||
|
||||
// Wait for the process to crash (it crashes after 3 seconds)
|
||||
console.log('⏳ Waiting for process to crash...');
|
||||
await new Promise(resolve => setTimeout(resolve, 5000));
|
||||
|
||||
// Check if crash log was created
|
||||
console.log('🔍 Checking for crash log...');
|
||||
const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
|
||||
console.log(` Found ${crashLogFiles.length} crash log files:`);
|
||||
crashLogFiles.forEach(file => console.log(` - ${file}`));
|
||||
|
||||
if (crashLogFiles.length === 0) {
|
||||
throw new Error('No crash logs were created!');
|
||||
}
|
||||
|
||||
// Find the crash log for our test process
|
||||
const testCrashLog = crashLogFiles.find(file => file.includes('crash-test'));
|
||||
if (!testCrashLog) {
|
||||
throw new Error('Could not find crash log for test process');
|
||||
}
|
||||
|
||||
// Read and display crash log content
|
||||
const crashLogPath = plugins.path.join(crashLogsDir, testCrashLog);
|
||||
const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
|
||||
|
||||
console.log('\n📋 Crash log content:');
|
||||
console.log('─'.repeat(60));
|
||||
console.log(crashLogContent);
|
||||
console.log('─'.repeat(60));
|
||||
|
||||
// Verify crash log contains expected information
|
||||
const checks = [
|
||||
{ text: 'CRASH REPORT', found: crashLogContent.includes('CRASH REPORT') },
|
||||
{ text: 'Exit Code: 42', found: crashLogContent.includes('Exit Code: 42') },
|
||||
{ text: 'About to crash', found: crashLogContent.includes('About to crash') },
|
||||
{ text: 'Process is running', found: crashLogContent.includes('Process is running') }
|
||||
];
|
||||
|
||||
console.log('\n✅ Verification:');
|
||||
checks.forEach(check => {
|
||||
console.log(` ${check.found ? '✓' : '✗'} Contains "${check.text}"`);
|
||||
});
|
||||
|
||||
const allChecksPassed = checks.every(c => c.found);
|
||||
|
||||
// Clean up
|
||||
console.log('\n🧹 Cleaning up...');
|
||||
execSync(`tsx ts/cli.ts delete ${processId}`, { stdio: 'inherit' });
|
||||
execSync('tsx ts/cli.ts daemon stop', { stdio: 'inherit' });
|
||||
await fs.unlink(crashScriptPath).catch(() => {});
|
||||
|
||||
if (allChecksPassed) {
|
||||
console.log('\n✅ All crash log tests passed!');
|
||||
} else {
|
||||
console.log('\n❌ Some crash log tests failed!');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('\n❌ Test failed:', error);
|
||||
|
||||
// Clean up on error
|
||||
try {
|
||||
execSync('tsx ts/cli.ts daemon stop', { stdio: 'inherit' });
|
||||
await fs.unlink(crashScriptPath).catch(() => {});
|
||||
} catch {}
|
||||
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
// Run the test
|
||||
testCrashLog();
|
||||
172
test/test.crashlog.ts
Normal file
172
test/test.crashlog.ts
Normal file
@@ -0,0 +1,172 @@
|
||||
import { tap, expect } from '@git.zone/tstest/tapbundle';
|
||||
import * as plugins from '../ts/plugins.js';
|
||||
import * as paths from '../ts/paths.js';
|
||||
import * as fs from 'fs/promises';
|
||||
|
||||
// Import tspm client
|
||||
import { tspmIpcClient } from '../ts/client/tspm.ipcclient.js';
|
||||
|
||||
// Test process that will crash
|
||||
const CRASH_SCRIPT = `
|
||||
setInterval(() => {
|
||||
console.log('[test] Process is running...');
|
||||
}, 1000);
|
||||
|
||||
setTimeout(() => {
|
||||
console.error('[test] About to crash with non-zero exit code!');
|
||||
process.exit(42);
|
||||
}, 3000);
|
||||
`;
|
||||
|
||||
tap.test('should create crash logs when process crashes', async (tools) => {
|
||||
const crashScriptPath = plugins.path.join(paths.tspmDir, 'test-crash-script.js');
|
||||
const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
|
||||
|
||||
// Clean up any existing crash logs
|
||||
try {
|
||||
await fs.rm(crashLogsDir, { recursive: true, force: true });
|
||||
} catch {}
|
||||
|
||||
// Write the crash script
|
||||
await fs.writeFile(crashScriptPath, CRASH_SCRIPT);
|
||||
|
||||
// Start the daemon
|
||||
console.log('Starting daemon...');
|
||||
const daemonResult = await tools.runCommand('tsx ts/cli/tspm.cli.ts daemon start');
|
||||
expect(daemonResult.exitCode).toEqual(0);
|
||||
|
||||
// Wait for daemon to be ready
|
||||
await tools.wait(2000);
|
||||
|
||||
// Add a process that will crash
|
||||
console.log('Adding crash test process...');
|
||||
const addResult = await tools.runCommand(`tsx ts/cli/tspm.cli.ts add "node ${crashScriptPath}" --name crash-test`);
|
||||
expect(addResult.exitCode).toEqual(0);
|
||||
|
||||
// Extract process ID from output
|
||||
const idMatch = addResult.stdout.match(/Process added with ID: (\d+)/);
|
||||
expect(idMatch).toBeTruthy();
|
||||
const processId = parseInt(idMatch![1]);
|
||||
|
||||
// Start the process
|
||||
console.log('Starting process that will crash...');
|
||||
const startResult = await tools.runCommand(`tsx ts/cli/tspm.cli.ts start ${processId}`);
|
||||
expect(startResult.exitCode).toEqual(0);
|
||||
|
||||
// Wait for the process to crash (it crashes after 3 seconds)
|
||||
console.log('Waiting for process to crash...');
|
||||
await tools.wait(5000);
|
||||
|
||||
// Check if crash log was created
|
||||
console.log('Checking for crash log...');
|
||||
const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
|
||||
console.log(`Found ${crashLogFiles.length} crash log files:`, crashLogFiles);
|
||||
|
||||
// Should have at least one crash log
|
||||
expect(crashLogFiles.length).toBeGreaterThan(0);
|
||||
|
||||
// Find the crash log for our test process
|
||||
const testCrashLog = crashLogFiles.find(file => file.includes('crash-test'));
|
||||
expect(testCrashLog).toBeTruthy();
|
||||
|
||||
// Read and verify crash log content
|
||||
const crashLogPath = plugins.path.join(crashLogsDir, testCrashLog!);
|
||||
const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
|
||||
|
||||
console.log('Crash log content:');
|
||||
console.log(crashLogContent);
|
||||
|
||||
// Verify crash log contains expected information
|
||||
expect(crashLogContent).toIncludeIgnoreCase('crash report');
|
||||
expect(crashLogContent).toIncludeIgnoreCase('exit code: 42');
|
||||
expect(crashLogContent).toIncludeIgnoreCase('About to crash');
|
||||
|
||||
// Stop the process
|
||||
console.log('Cleaning up...');
|
||||
await tools.runCommand(`tsx ts/cli/tspm.cli.ts delete ${processId}`);
|
||||
|
||||
// Stop the daemon
|
||||
await tools.runCommand('tsx ts/cli/tspm.cli.ts daemon stop');
|
||||
|
||||
// Clean up test file
|
||||
await fs.unlink(crashScriptPath).catch(() => {});
|
||||
});
|
||||
|
||||
tap.test('should create crash logs when process is killed', async (tools) => {
|
||||
const killScriptPath = plugins.path.join(paths.tspmDir, 'test-kill-script.js');
|
||||
const crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
|
||||
|
||||
// Write a script that runs indefinitely
|
||||
const KILL_SCRIPT = `
|
||||
setInterval(() => {
|
||||
console.log('[test] Process is running and will be killed...');
|
||||
}, 500);
|
||||
`;
|
||||
|
||||
await fs.writeFile(killScriptPath, KILL_SCRIPT);
|
||||
|
||||
// Start the daemon
|
||||
console.log('Starting daemon...');
|
||||
const daemonResult = await tools.runCommand('tsx ts/cli/tspm.cli.ts daemon start');
|
||||
expect(daemonResult.exitCode).toEqual(0);
|
||||
|
||||
// Wait for daemon to be ready
|
||||
await tools.wait(2000);
|
||||
|
||||
// Add a process that we'll kill
|
||||
console.log('Adding kill test process...');
|
||||
const addResult = await tools.runCommand(`tsx ts/cli/tspm.cli.ts add "node ${killScriptPath}" --name kill-test`);
|
||||
expect(addResult.exitCode).toEqual(0);
|
||||
|
||||
// Extract process ID
|
||||
const idMatch = addResult.stdout.match(/Process added with ID: (\d+)/);
|
||||
expect(idMatch).toBeTruthy();
|
||||
const processId = parseInt(idMatch![1]);
|
||||
|
||||
// Start the process
|
||||
console.log('Starting process to be killed...');
|
||||
const startResult = await tools.runCommand(`tsx ts/cli/tspm.cli.ts start ${processId}`);
|
||||
expect(startResult.exitCode).toEqual(0);
|
||||
|
||||
// Wait for process to run a bit
|
||||
await tools.wait(2000);
|
||||
|
||||
// Get the actual PID of the running process
|
||||
const statusResult = await tools.runCommand(`tsx ts/cli/tspm.cli.ts describe ${processId}`);
|
||||
const pidMatch = statusResult.stdout.match(/pid:\s+(\d+)/);
|
||||
|
||||
if (pidMatch) {
|
||||
const pid = parseInt(pidMatch[1]);
|
||||
console.log(`Killing process with PID ${pid}...`);
|
||||
|
||||
// Kill the process with SIGTERM
|
||||
await tools.runCommand(`kill -TERM ${pid}`);
|
||||
|
||||
// Wait for crash log to be created
|
||||
await tools.wait(3000);
|
||||
|
||||
// Check for crash log
|
||||
console.log('Checking for crash log from killed process...');
|
||||
const crashLogFiles = await fs.readdir(crashLogsDir).catch(() => []);
|
||||
const killCrashLog = crashLogFiles.find(file => file.includes('kill-test'));
|
||||
|
||||
if (killCrashLog) {
|
||||
const crashLogPath = plugins.path.join(crashLogsDir, killCrashLog);
|
||||
const crashLogContent = await fs.readFile(crashLogPath, 'utf-8');
|
||||
|
||||
console.log('Kill crash log content:');
|
||||
console.log(crashLogContent);
|
||||
|
||||
// Verify it contains signal information
|
||||
expect(crashLogContent).toIncludeIgnoreCase('signal: SIGTERM');
|
||||
}
|
||||
}
|
||||
|
||||
// Clean up
|
||||
console.log('Cleaning up...');
|
||||
await tools.runCommand(`tsx ts/cli/tspm.cli.ts delete ${processId}`);
|
||||
await tools.runCommand('tsx ts/cli/tspm.cli.ts daemon stop');
|
||||
await fs.unlink(killScriptPath).catch(() => {});
|
||||
});
|
||||
|
||||
export default tap.start();
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@git.zone/tspm',
|
||||
version: '5.7.0',
|
||||
version: '5.10.2',
|
||||
description: 'a no fuzz process manager'
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
|
||||
console.log(' --watch Watch for file changes');
|
||||
console.log(' --watch-paths <paths> Comma-separated paths');
|
||||
console.log(' --autorestart Auto-restart on crash (default true)');
|
||||
console.log(' -i, --interactive Enter interactive edit mode after adding');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -29,6 +30,9 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
|
||||
? parseMemoryString(argvArg.memory)
|
||||
: 512 * 1024 * 1024;
|
||||
|
||||
// Check for interactive flag
|
||||
const isInteractive = argvArg.i || argvArg.interactive;
|
||||
|
||||
// Resolve .ts single-file execution via tsx if needed
|
||||
const parts = script.split(' ');
|
||||
const first = parts[0];
|
||||
@@ -112,6 +116,12 @@ export function registerAddCommand(smartcli: plugins.smartcli.Smartcli) {
|
||||
|
||||
console.log('✓ Added');
|
||||
console.log(` Assigned ID: ${response.id}`);
|
||||
|
||||
// If interactive flag is set, enter edit mode
|
||||
if (isInteractive) {
|
||||
const { interactiveEditProcess } = await import('../../helpers/interactive-edit.js');
|
||||
await interactiveEditProcess(response.id);
|
||||
}
|
||||
},
|
||||
{ actionLabel: 'add process config' },
|
||||
);
|
||||
|
||||
@@ -16,58 +16,12 @@ export function registerEditCommand(smartcli: plugins.smartcli.Smartcli) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Resolve and load current config
|
||||
// Resolve the target to get the process ID
|
||||
const resolved = await tspmIpcClient.request('resolveTarget', { target: String(target) });
|
||||
const { config } = await tspmIpcClient.request('describe', { id: resolved.id });
|
||||
|
||||
// Interactive editing is temporarily disabled - needs smartinteract API update
|
||||
console.log('Interactive editing is temporarily disabled.');
|
||||
console.log('Current configuration:');
|
||||
console.log(` Name: ${config.name}`);
|
||||
console.log(` Command: ${config.command}`);
|
||||
console.log(` Directory: ${config.projectDir}`);
|
||||
console.log(` Memory: ${formatMemory(config.memoryLimitBytes)}`);
|
||||
console.log(` Auto-restart: ${config.autorestart}`);
|
||||
console.log(` Watch: ${config.watch ? 'enabled' : 'disabled'}`);
|
||||
|
||||
// For now, just update environment variables to current
|
||||
const essentialEnvVars: NodeJS.ProcessEnv = {
|
||||
PATH: process.env.PATH || '',
|
||||
HOME: process.env.HOME,
|
||||
USER: process.env.USER,
|
||||
SHELL: process.env.SHELL,
|
||||
LANG: process.env.LANG,
|
||||
LC_ALL: process.env.LC_ALL,
|
||||
// Node.js specific
|
||||
NODE_ENV: process.env.NODE_ENV,
|
||||
NODE_PATH: process.env.NODE_PATH,
|
||||
// npm/pnpm/yarn paths
|
||||
npm_config_prefix: process.env.npm_config_prefix,
|
||||
// Include any TSPM_ prefixed vars
|
||||
...Object.fromEntries(
|
||||
Object.entries(process.env).filter(([key]) => key.startsWith('TSPM_'))
|
||||
),
|
||||
};
|
||||
|
||||
// Remove undefined values
|
||||
Object.keys(essentialEnvVars).forEach(key => {
|
||||
if (essentialEnvVars[key] === undefined) {
|
||||
delete essentialEnvVars[key];
|
||||
}
|
||||
});
|
||||
|
||||
// Update environment variables
|
||||
const updates = {
|
||||
env: { ...(config.env || {}), ...essentialEnvVars }
|
||||
};
|
||||
|
||||
const updateResponse = await tspmIpcClient.request('update', {
|
||||
id: resolved.id,
|
||||
updates,
|
||||
});
|
||||
|
||||
console.log('✓ Environment variables updated');
|
||||
console.log(' Process configuration updated successfully');
|
||||
// Use the shared interactive edit function
|
||||
const { interactiveEditProcess } = await import('../../helpers/interactive-edit.js');
|
||||
await interactiveEditProcess(resolved.id);
|
||||
},
|
||||
{ actionLabel: 'edit process config' },
|
||||
);
|
||||
|
||||
@@ -14,7 +14,9 @@ export function registerListCommand(smartcli: plugins.smartcli.Smartcli) {
|
||||
const processes = response.processes;
|
||||
|
||||
if (processes.length === 0) {
|
||||
console.log('No processes running.');
|
||||
console.log('No processes configured.');
|
||||
console.log('Use "tspm add <command>" to add one, e.g.:');
|
||||
console.log(' tspm add "pnpm start"');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
164
ts/cli/helpers/interactive-edit.ts
Normal file
164
ts/cli/helpers/interactive-edit.ts
Normal file
@@ -0,0 +1,164 @@
|
||||
import * as plugins from '../plugins.js';
|
||||
import { tspmIpcClient } from '../../client/tspm.ipcclient.js';
|
||||
import { formatMemory, parseMemoryString } from './memory.js';
|
||||
|
||||
export async function interactiveEditProcess(processId: number): Promise<void> {
|
||||
// Load current config
|
||||
const { config } = await tspmIpcClient.request('describe', { id: processId as any });
|
||||
|
||||
// Create interactive prompts for editing
|
||||
const smartInteract = new plugins.smartinteract.SmartInteract([
|
||||
{
|
||||
name: 'name',
|
||||
type: 'input',
|
||||
message: 'Process name:',
|
||||
default: config.name,
|
||||
validate: (input: string) => {
|
||||
return input && input.trim() !== '';
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'command',
|
||||
type: 'input',
|
||||
message: 'Command to execute:',
|
||||
default: config.command,
|
||||
validate: (input: string) => {
|
||||
return input && input.trim() !== '';
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'projectDir',
|
||||
type: 'input',
|
||||
message: 'Working directory:',
|
||||
default: config.projectDir,
|
||||
validate: (input: string) => {
|
||||
return input && input.trim() !== '';
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'memoryLimit',
|
||||
type: 'input',
|
||||
message: 'Memory limit (e.g., 512M, 1G):',
|
||||
default: formatMemory(config.memoryLimitBytes),
|
||||
validate: (input: string) => {
|
||||
const parsed = parseMemoryString(input);
|
||||
return parsed !== null;
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'autorestart',
|
||||
type: 'confirm',
|
||||
message: 'Enable auto-restart on failure?',
|
||||
default: config.autorestart
|
||||
},
|
||||
{
|
||||
name: 'watch',
|
||||
type: 'confirm',
|
||||
message: 'Enable file watching for auto-restart?',
|
||||
default: config.watch || false
|
||||
},
|
||||
{
|
||||
name: 'updateEnv',
|
||||
type: 'confirm',
|
||||
message: 'Update environment variables to current environment?',
|
||||
default: true
|
||||
}
|
||||
]);
|
||||
|
||||
console.log('\n📝 Edit Process Configuration');
|
||||
console.log(` Process ID: ${processId}`);
|
||||
console.log(' (Press Enter to keep current values)\n');
|
||||
|
||||
// Run the interactive prompts
|
||||
const answerBucket = await smartInteract.runQueue();
|
||||
|
||||
// Get answers from the bucket
|
||||
const name = answerBucket.getAnswerFor('name');
|
||||
const command = answerBucket.getAnswerFor('command');
|
||||
const projectDir = answerBucket.getAnswerFor('projectDir');
|
||||
const memoryLimit = answerBucket.getAnswerFor('memoryLimit');
|
||||
const autorestart = answerBucket.getAnswerFor('autorestart');
|
||||
const watch = answerBucket.getAnswerFor('watch');
|
||||
const updateEnv = answerBucket.getAnswerFor('updateEnv');
|
||||
|
||||
// Prepare updates object
|
||||
const updates: any = {};
|
||||
|
||||
// Check what has changed
|
||||
if (name !== config.name) {
|
||||
updates.name = name;
|
||||
}
|
||||
|
||||
if (command !== config.command) {
|
||||
updates.command = command;
|
||||
}
|
||||
|
||||
if (projectDir !== config.projectDir) {
|
||||
updates.projectDir = projectDir;
|
||||
}
|
||||
|
||||
const newMemoryBytes = parseMemoryString(memoryLimit);
|
||||
if (newMemoryBytes !== config.memoryLimitBytes) {
|
||||
updates.memoryLimitBytes = newMemoryBytes;
|
||||
}
|
||||
|
||||
if (autorestart !== config.autorestart) {
|
||||
updates.autorestart = autorestart;
|
||||
}
|
||||
|
||||
if (watch !== config.watch) {
|
||||
updates.watch = watch;
|
||||
}
|
||||
|
||||
// Handle environment variables update if requested
|
||||
if (updateEnv) {
|
||||
const essentialEnvVars: NodeJS.ProcessEnv = {
|
||||
PATH: process.env.PATH || '',
|
||||
HOME: process.env.HOME,
|
||||
USER: process.env.USER,
|
||||
SHELL: process.env.SHELL,
|
||||
LANG: process.env.LANG,
|
||||
LC_ALL: process.env.LC_ALL,
|
||||
// Node.js specific
|
||||
NODE_ENV: process.env.NODE_ENV,
|
||||
NODE_PATH: process.env.NODE_PATH,
|
||||
// npm/pnpm/yarn paths
|
||||
npm_config_prefix: process.env.npm_config_prefix,
|
||||
// Include any TSPM_ prefixed vars
|
||||
...Object.fromEntries(
|
||||
Object.entries(process.env).filter(([key]) => key.startsWith('TSPM_'))
|
||||
),
|
||||
};
|
||||
|
||||
// Remove undefined values
|
||||
Object.keys(essentialEnvVars).forEach(key => {
|
||||
if (essentialEnvVars[key] === undefined) {
|
||||
delete essentialEnvVars[key];
|
||||
}
|
||||
});
|
||||
|
||||
updates.env = { ...(config.env || {}), ...essentialEnvVars };
|
||||
}
|
||||
|
||||
// Only update if there are changes
|
||||
if (Object.keys(updates).length === 0) {
|
||||
console.log('\n✓ No changes made');
|
||||
return;
|
||||
}
|
||||
|
||||
// Send updates to daemon
|
||||
await tspmIpcClient.request('update', {
|
||||
id: processId as any,
|
||||
updates,
|
||||
});
|
||||
|
||||
// Display what was updated
|
||||
console.log('\n✓ Process configuration updated successfully');
|
||||
if (updates.name) console.log(` Name: ${updates.name}`);
|
||||
if (updates.command) console.log(` Command: ${updates.command}`);
|
||||
if (updates.projectDir) console.log(` Directory: ${updates.projectDir}`);
|
||||
if (updates.memoryLimitBytes) console.log(` Memory limit: ${formatMemory(updates.memoryLimitBytes)}`);
|
||||
if (updates.autorestart !== undefined) console.log(` Auto-restart: ${updates.autorestart}`);
|
||||
if (updates.watch !== undefined) console.log(` Watch: ${updates.watch ? 'enabled' : 'disabled'}`);
|
||||
if (updateEnv) console.log(' Environment variables: updated');
|
||||
}
|
||||
@@ -17,6 +17,9 @@ export class TspmIpcClient {
|
||||
private socketPath: string;
|
||||
private daemonPidFile: string;
|
||||
private isConnected: boolean = false;
|
||||
// Store event handlers for cleanup
|
||||
private heartbeatTimeoutHandler?: () => void;
|
||||
private markDisconnectedHandler?: () => void;
|
||||
|
||||
constructor() {
|
||||
this.socketPath = plugins.path.join(paths.tspmDir, 'tspm.sock');
|
||||
@@ -74,20 +77,21 @@ export class TspmIpcClient {
|
||||
this.isConnected = true;
|
||||
|
||||
// Handle heartbeat timeouts gracefully
|
||||
this.ipcClient.on('heartbeatTimeout', () => {
|
||||
this.heartbeatTimeoutHandler = () => {
|
||||
console.warn('Heartbeat timeout detected, connection may be degraded');
|
||||
this.isConnected = false;
|
||||
});
|
||||
};
|
||||
this.ipcClient.on('heartbeatTimeout', this.heartbeatTimeoutHandler);
|
||||
|
||||
// Reflect connection lifecycle on the client state
|
||||
const markDisconnected = () => {
|
||||
this.markDisconnectedHandler = () => {
|
||||
this.isConnected = false;
|
||||
};
|
||||
// Common lifecycle events
|
||||
this.ipcClient.on('disconnect', markDisconnected as any);
|
||||
this.ipcClient.on('close', markDisconnected as any);
|
||||
this.ipcClient.on('end', markDisconnected as any);
|
||||
this.ipcClient.on('error', markDisconnected as any);
|
||||
this.ipcClient.on('disconnect', this.markDisconnectedHandler as any);
|
||||
this.ipcClient.on('close', this.markDisconnectedHandler as any);
|
||||
this.ipcClient.on('end', this.markDisconnectedHandler as any);
|
||||
this.ipcClient.on('error', this.markDisconnectedHandler as any);
|
||||
|
||||
// connected
|
||||
} catch (error) {
|
||||
@@ -103,6 +107,21 @@ export class TspmIpcClient {
|
||||
*/
|
||||
public async disconnect(): Promise<void> {
|
||||
if (this.ipcClient) {
|
||||
// Remove event listeners before disconnecting
|
||||
if (this.heartbeatTimeoutHandler) {
|
||||
this.ipcClient.removeListener('heartbeatTimeout', this.heartbeatTimeoutHandler);
|
||||
}
|
||||
if (this.markDisconnectedHandler) {
|
||||
this.ipcClient.removeListener('disconnect', this.markDisconnectedHandler as any);
|
||||
this.ipcClient.removeListener('close', this.markDisconnectedHandler as any);
|
||||
this.ipcClient.removeListener('end', this.markDisconnectedHandler as any);
|
||||
this.ipcClient.removeListener('error', this.markDisconnectedHandler as any);
|
||||
}
|
||||
|
||||
// Clear handler references
|
||||
this.heartbeatTimeoutHandler = undefined;
|
||||
this.markDisconnectedHandler = undefined;
|
||||
|
||||
await this.ipcClient.disconnect();
|
||||
this.ipcClient = null;
|
||||
this.isConnected = false;
|
||||
|
||||
265
ts/daemon/crashlogmanager.ts
Normal file
265
ts/daemon/crashlogmanager.ts
Normal file
@@ -0,0 +1,265 @@
|
||||
import * as plugins from '../plugins.js';
|
||||
import * as paths from '../paths.js';
|
||||
import type { IProcessLog } from '../shared/protocol/ipc.types.js';
|
||||
import type { ProcessId } from '../shared/protocol/id.js';
|
||||
|
||||
/**
|
||||
* Manages crash log storage for failed processes
|
||||
*/
|
||||
export class CrashLogManager {
|
||||
private crashLogsDir: string;
|
||||
private readonly MAX_CRASH_LOGS = 100;
|
||||
private readonly MAX_LOG_SIZE_BYTES = 1024 * 1024; // 1MB
|
||||
|
||||
constructor() {
|
||||
this.crashLogsDir = plugins.path.join(paths.tspmDir, 'crashlogs');
|
||||
}
|
||||
|
||||
/**
|
||||
* Save a crash log for a failed process
|
||||
*/
|
||||
public async saveCrashLog(
|
||||
processId: ProcessId,
|
||||
processName: string,
|
||||
logs: IProcessLog[],
|
||||
exitCode: number | null,
|
||||
signal: string | null,
|
||||
restartCount: number,
|
||||
memoryUsage?: number
|
||||
): Promise<void> {
|
||||
try {
|
||||
// Ensure directory exists
|
||||
await this.ensureCrashLogsDir();
|
||||
|
||||
// Generate filename with timestamp
|
||||
const timestamp = new Date();
|
||||
const dateStr = this.formatDate(timestamp);
|
||||
const sanitizedName = this.sanitizeFilename(processName);
|
||||
const filename = `${dateStr}_${processId}_${sanitizedName}.log`;
|
||||
const filepath = plugins.path.join(this.crashLogsDir, filename);
|
||||
|
||||
// Get recent logs that fit within size limit
|
||||
const recentLogs = this.getRecentLogs(logs, this.MAX_LOG_SIZE_BYTES);
|
||||
|
||||
// Create crash report
|
||||
const crashReport = this.formatCrashReport({
|
||||
processId,
|
||||
processName,
|
||||
timestamp,
|
||||
exitCode,
|
||||
signal,
|
||||
restartCount,
|
||||
memoryUsage,
|
||||
logs: recentLogs
|
||||
});
|
||||
|
||||
// Write crash log
|
||||
await plugins.smartfile.memory.toFs(crashReport, filepath);
|
||||
|
||||
// Rotate old logs if needed
|
||||
await this.rotateOldLogs();
|
||||
|
||||
console.log(`Crash log saved: ${filename}`);
|
||||
} catch (error) {
|
||||
console.error(`Failed to save crash log for process ${processId}:`, error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Format date for filename: YYYY-MM-DD_HH-mm-ss
|
||||
*/
|
||||
private formatDate(date: Date): string {
|
||||
const year = date.getFullYear();
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(date.getDate()).padStart(2, '0');
|
||||
const hours = String(date.getHours()).padStart(2, '0');
|
||||
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||
const seconds = String(date.getSeconds()).padStart(2, '0');
|
||||
return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitize process name for use in filename
|
||||
*/
|
||||
private sanitizeFilename(name: string): string {
|
||||
// Replace problematic characters with underscore
|
||||
return name
|
||||
.replace(/[^a-zA-Z0-9-_]/g, '_')
|
||||
.replace(/_+/g, '_')
|
||||
.substring(0, 50); // Limit length
|
||||
}
|
||||
|
||||
/**
|
||||
* Get recent logs that fit within the size limit
|
||||
*/
|
||||
private getRecentLogs(logs: IProcessLog[], maxBytes: number): IProcessLog[] {
|
||||
if (logs.length === 0) return [];
|
||||
|
||||
// Start from the end and work backwards
|
||||
const recentLogs: IProcessLog[] = [];
|
||||
let currentSize = 0;
|
||||
|
||||
for (let i = logs.length - 1; i >= 0; i--) {
|
||||
const log = logs[i];
|
||||
const logSize = this.estimateLogSize(log);
|
||||
|
||||
if (currentSize + logSize > maxBytes && recentLogs.length > 0) {
|
||||
// Would exceed limit, stop adding
|
||||
break;
|
||||
}
|
||||
|
||||
recentLogs.unshift(log);
|
||||
currentSize += logSize;
|
||||
}
|
||||
|
||||
return recentLogs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Estimate size of a log entry in bytes
|
||||
*/
|
||||
private estimateLogSize(log: IProcessLog): number {
|
||||
// Format: [timestamp] [type] message\n
|
||||
const formatted = `[${new Date(log.timestamp).toISOString()}] [${log.type}] ${log.message}\n`;
|
||||
return Buffer.byteLength(formatted, 'utf8');
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a crash report with metadata and logs
|
||||
*/
|
||||
private formatCrashReport(data: {
|
||||
processId: ProcessId;
|
||||
processName: string;
|
||||
timestamp: Date;
|
||||
exitCode: number | null;
|
||||
signal: string | null;
|
||||
restartCount: number;
|
||||
memoryUsage?: number;
|
||||
logs: IProcessLog[];
|
||||
}): string {
|
||||
const lines: string[] = [
|
||||
'================================================================================',
|
||||
'TSPM CRASH REPORT',
|
||||
'================================================================================',
|
||||
`Process: ${data.processName} (ID: ${data.processId})`,
|
||||
`Date: ${data.timestamp.toISOString()}`,
|
||||
`Exit Code: ${data.exitCode ?? 'N/A'}`,
|
||||
`Signal: ${data.signal ?? 'N/A'}`,
|
||||
`Restart Attempt: ${data.restartCount}/10`,
|
||||
];
|
||||
|
||||
if (data.memoryUsage !== undefined && data.memoryUsage > 0) {
|
||||
lines.push(`Memory Usage: ${this.humanReadableBytes(data.memoryUsage)}`);
|
||||
}
|
||||
|
||||
lines.push(
|
||||
'================================================================================',
|
||||
'',
|
||||
`LAST ${data.logs.length} LOG ENTRIES:`,
|
||||
'--------------------------------------------------------------------------------',
|
||||
''
|
||||
);
|
||||
|
||||
// Add log entries
|
||||
for (const log of data.logs) {
|
||||
const timestamp = new Date(log.timestamp).toISOString();
|
||||
const type = log.type.toUpperCase().padEnd(6);
|
||||
lines.push(`[${timestamp}] [${type}] ${log.message}`);
|
||||
}
|
||||
|
||||
lines.push(
|
||||
'',
|
||||
'================================================================================',
|
||||
'END OF CRASH REPORT',
|
||||
'================================================================================',
|
||||
''
|
||||
);
|
||||
|
||||
return lines.join('\n');
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert bytes to human-readable format
|
||||
*/
|
||||
private humanReadableBytes(bytes: number): string {
|
||||
if (bytes === 0) return '0 Bytes';
|
||||
const k = 1024;
|
||||
const sizes = ['Bytes', 'KB', 'MB', 'GB'];
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k));
|
||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure crash logs directory exists
|
||||
*/
|
||||
private async ensureCrashLogsDir(): Promise<void> {
|
||||
await plugins.smartfile.fs.ensureDir(this.crashLogsDir);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rotate old crash logs when exceeding max count
|
||||
*/
|
||||
private async rotateOldLogs(): Promise<void> {
|
||||
try {
|
||||
// Get all crash log files
|
||||
const files = await plugins.smartfile.fs.listFileTree(this.crashLogsDir, '*.log');
|
||||
|
||||
if (files.length <= this.MAX_CRASH_LOGS) {
|
||||
return; // No rotation needed
|
||||
}
|
||||
|
||||
// Get file stats and sort by modification time (oldest first)
|
||||
const fileStats = await Promise.all(
|
||||
files.map(async (file) => {
|
||||
const filepath = plugins.path.join(this.crashLogsDir, file);
|
||||
const stats = await plugins.smartfile.fs.stat(filepath);
|
||||
return { filepath, mtime: stats.mtime.getTime() };
|
||||
})
|
||||
);
|
||||
|
||||
fileStats.sort((a, b) => a.mtime - b.mtime);
|
||||
|
||||
// Delete oldest files to stay under limit
|
||||
const filesToDelete = fileStats.length - this.MAX_CRASH_LOGS;
|
||||
for (let i = 0; i < filesToDelete; i++) {
|
||||
await plugins.smartfile.fs.remove(fileStats[i].filepath);
|
||||
console.log(`Rotated old crash log: ${plugins.path.basename(fileStats[i].filepath)}`);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to rotate crash logs:', error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get list of crash logs for a specific process
|
||||
*/
|
||||
public async getCrashLogsForProcess(processId: ProcessId): Promise<string[]> {
|
||||
try {
|
||||
await this.ensureCrashLogsDir();
|
||||
const files = await plugins.smartfile.fs.listFileTree(this.crashLogsDir, `*_${processId}_*.log`);
|
||||
return files.map(file => plugins.path.join(this.crashLogsDir, file));
|
||||
} catch (error) {
|
||||
console.error(`Failed to get crash logs for process ${processId}:`, error);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean up all crash logs (for maintenance)
|
||||
*/
|
||||
public async cleanupAllCrashLogs(): Promise<void> {
|
||||
try {
|
||||
await this.ensureCrashLogsDir();
|
||||
const files = await plugins.smartfile.fs.listFileTree(this.crashLogsDir, '*.log');
|
||||
|
||||
for (const file of files) {
|
||||
const filepath = plugins.path.join(this.crashLogsDir, file);
|
||||
await plugins.smartfile.fs.remove(filepath);
|
||||
}
|
||||
|
||||
console.log(`Cleaned up ${files.length} crash logs`);
|
||||
} catch (error) {
|
||||
console.error('Failed to cleanup crash logs:', error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -739,7 +739,8 @@ export class ProcessManager extends EventEmitter {
|
||||
throw configError;
|
||||
}
|
||||
} else {
|
||||
this.logger.info('No saved process configurations found');
|
||||
// First run / no configs yet — keep this quiet unless debugging
|
||||
this.logger.debug('No saved process configurations found');
|
||||
}
|
||||
} catch (error: Error | unknown) {
|
||||
// Only throw if it's not the "no configs found" case
|
||||
@@ -748,9 +749,7 @@ export class ProcessManager extends EventEmitter {
|
||||
}
|
||||
|
||||
// If no configs found or error reading, just continue with empty configs
|
||||
this.logger.info(
|
||||
'No saved process configurations found or error reading them',
|
||||
);
|
||||
this.logger.debug('No saved process configurations found or error reading them');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ import * as plugins from '../plugins.js';
|
||||
import { EventEmitter } from 'events';
|
||||
import { ProcessWrapper } from './processwrapper.js';
|
||||
import { LogPersistence } from './logpersistence.js';
|
||||
import { CrashLogManager } from './crashlogmanager.js';
|
||||
import { Logger, ProcessError, handleError } from '../shared/common/utils.errorhandler.js';
|
||||
import type { IMonitorConfig, IProcessLog } from '../shared/protocol/ipc.types.js';
|
||||
import type { ProcessId } from '../shared/protocol/id.js';
|
||||
@@ -15,6 +16,7 @@ export class ProcessMonitor extends EventEmitter {
|
||||
private logger: Logger;
|
||||
private logs: IProcessLog[] = [];
|
||||
private logPersistence: LogPersistence;
|
||||
private crashLogManager: CrashLogManager;
|
||||
private processId?: ProcessId;
|
||||
private currentLogMemorySize: number = 0;
|
||||
private readonly MAX_LOG_MEMORY_SIZE = 10 * 1024 * 1024; // 10MB
|
||||
@@ -26,6 +28,11 @@ export class ProcessMonitor extends EventEmitter {
|
||||
private readonly RESET_WINDOW_MS = 60 * 60 * 1000; // 1 hour
|
||||
private lastMemoryUsage: number = 0;
|
||||
private lastCpuUsage: number = 0;
|
||||
// Store event listeners for cleanup
|
||||
private logHandler?: (log: IProcessLog) => void;
|
||||
private startHandler?: (pid: number) => void;
|
||||
private exitHandler?: (code: number | null, signal: string | null) => Promise<void>;
|
||||
private errorHandler?: (error: Error | ProcessError) => Promise<void>;
|
||||
|
||||
constructor(config: IMonitorConfig & { id?: ProcessId }) {
|
||||
super();
|
||||
@@ -33,6 +40,7 @@ export class ProcessMonitor extends EventEmitter {
|
||||
this.logger = new Logger(`ProcessMonitor:${config.name || 'unnamed'}`);
|
||||
this.logs = [];
|
||||
this.logPersistence = new LogPersistence();
|
||||
this.crashLogManager = new CrashLogManager();
|
||||
this.processId = config.id;
|
||||
this.currentLogMemorySize = 0;
|
||||
}
|
||||
@@ -83,6 +91,14 @@ export class ProcessMonitor extends EventEmitter {
|
||||
|
||||
this.logger.info(`Spawning process: ${this.config.command}`);
|
||||
|
||||
// Clear any orphaned pidusage cache entries before spawning
|
||||
try {
|
||||
(plugins.pidusage as any)?.clearAll?.();
|
||||
} catch {}
|
||||
|
||||
// Clean up previous listeners if any
|
||||
this.cleanupListeners();
|
||||
|
||||
// Create a new process wrapper
|
||||
this.processWrapper = new ProcessWrapper({
|
||||
name: this.config.name || 'unnamed-process',
|
||||
@@ -94,7 +110,7 @@ export class ProcessMonitor extends EventEmitter {
|
||||
});
|
||||
|
||||
// Set up event handlers
|
||||
this.processWrapper.on('log', (log: IProcessLog): void => {
|
||||
this.logHandler = (log: IProcessLog): void => {
|
||||
// Store the log in our buffer
|
||||
this.logs.push(log);
|
||||
if (process.env.TSPM_DEBUG) {
|
||||
@@ -117,6 +133,7 @@ export class ProcessMonitor extends EventEmitter {
|
||||
// Remove oldest logs until we're under the memory limit
|
||||
const removed = this.logs.shift()!;
|
||||
const removedSize = this.logSizeMap.get(removed) ?? this.estimateLogSize(removed);
|
||||
this.logSizeMap.delete(removed); // Clean up map entry to prevent memory leak
|
||||
this.currentLogMemorySize -= removedSize;
|
||||
}
|
||||
|
||||
@@ -127,16 +144,16 @@ export class ProcessMonitor extends EventEmitter {
|
||||
if (log.type === 'system') {
|
||||
this.log(log.message);
|
||||
}
|
||||
});
|
||||
};
|
||||
this.processWrapper.on('log', this.logHandler);
|
||||
|
||||
// Re-emit start event with PID for upstream handlers
|
||||
this.processWrapper.on('start', (pid: number): void => {
|
||||
this.startHandler = (pid: number): void => {
|
||||
this.emit('start', pid);
|
||||
});
|
||||
};
|
||||
this.processWrapper.on('start', this.startHandler);
|
||||
|
||||
this.processWrapper.on(
|
||||
'exit',
|
||||
async (code: number | null, signal: string | null): Promise<void> => {
|
||||
this.exitHandler = async (code: number | null, signal: string | null): Promise<void> => {
|
||||
const exitMsg = `Process exited with code ${code}, signal ${signal}.`;
|
||||
this.logger.info(exitMsg);
|
||||
this.log(exitMsg);
|
||||
@@ -149,6 +166,27 @@ export class ProcessMonitor extends EventEmitter {
|
||||
}
|
||||
} catch {}
|
||||
|
||||
// Detect if this was a crash (non-zero exit code or killed by signal)
|
||||
const isCrash = (code !== null && code !== 0) || signal !== null;
|
||||
|
||||
// Save crash log if this was a crash
|
||||
if (isCrash && this.processId && this.config.name) {
|
||||
try {
|
||||
await this.crashLogManager.saveCrashLog(
|
||||
this.processId,
|
||||
this.config.name,
|
||||
this.logs,
|
||||
code,
|
||||
signal,
|
||||
this.restartCount,
|
||||
this.lastMemoryUsage
|
||||
);
|
||||
this.logger.info(`Saved crash log for process ${this.config.name}`);
|
||||
} catch (error) {
|
||||
this.logger.error(`Failed to save crash log: ${error}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Flush logs to disk on exit
|
||||
if (this.processId && this.logs.length > 0) {
|
||||
try {
|
||||
@@ -169,10 +207,10 @@ export class ProcessMonitor extends EventEmitter {
|
||||
'Not restarting process because monitor is stopped',
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
this.processWrapper.on('exit', this.exitHandler);
|
||||
|
||||
this.processWrapper.on('error', async (error: Error | ProcessError): Promise<void> => {
|
||||
this.errorHandler = async (error: Error | ProcessError): Promise<void> => {
|
||||
const errorMsg =
|
||||
error instanceof ProcessError
|
||||
? `Process error: ${error.toString()}`
|
||||
@@ -181,6 +219,24 @@ export class ProcessMonitor extends EventEmitter {
|
||||
this.logger.error(error);
|
||||
this.log(errorMsg);
|
||||
|
||||
// Save crash log for errors
|
||||
if (this.processId && this.config.name) {
|
||||
try {
|
||||
await this.crashLogManager.saveCrashLog(
|
||||
this.processId,
|
||||
this.config.name,
|
||||
this.logs,
|
||||
null, // no exit code for errors
|
||||
null, // no signal for errors
|
||||
this.restartCount,
|
||||
this.lastMemoryUsage
|
||||
);
|
||||
this.logger.info(`Saved crash log for process ${this.config.name} due to error`);
|
||||
} catch (crashLogError) {
|
||||
this.logger.error(`Failed to save crash log: ${crashLogError}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Flush logs to disk on error
|
||||
if (this.processId && this.logs.length > 0) {
|
||||
try {
|
||||
@@ -196,7 +252,8 @@ export class ProcessMonitor extends EventEmitter {
|
||||
} else {
|
||||
this.logger.debug('Not restarting process because monitor is stopped');
|
||||
}
|
||||
});
|
||||
};
|
||||
this.processWrapper.on('error', this.errorHandler);
|
||||
|
||||
// Start the process
|
||||
try {
|
||||
@@ -210,6 +267,31 @@ export class ProcessMonitor extends EventEmitter {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean up event listeners from process wrapper
|
||||
*/
|
||||
private cleanupListeners(): void {
|
||||
if (this.processWrapper) {
|
||||
if (this.logHandler) {
|
||||
this.processWrapper.removeListener('log', this.logHandler);
|
||||
}
|
||||
if (this.startHandler) {
|
||||
this.processWrapper.removeListener('start', this.startHandler);
|
||||
}
|
||||
if (this.exitHandler) {
|
||||
this.processWrapper.removeListener('exit', this.exitHandler);
|
||||
}
|
||||
if (this.errorHandler) {
|
||||
this.processWrapper.removeListener('error', this.errorHandler);
|
||||
}
|
||||
}
|
||||
// Clear references
|
||||
this.logHandler = undefined;
|
||||
this.startHandler = undefined;
|
||||
this.exitHandler = undefined;
|
||||
this.errorHandler = undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Schedule a restart with incremental debounce and failure cutoff.
|
||||
*/
|
||||
@@ -353,13 +435,19 @@ export class ProcessMonitor extends EventEmitter {
|
||||
let totalMemory = 0;
|
||||
let totalCpu = 0;
|
||||
for (const key in stats) {
|
||||
totalMemory += stats[key].memory;
|
||||
totalCpu += Number.isFinite(stats[key].cpu) ? stats[key].cpu : 0;
|
||||
// Check if stats[key] exists and is not null (process may have exited)
|
||||
if (stats[key]) {
|
||||
totalMemory += stats[key].memory || 0;
|
||||
totalCpu += Number.isFinite(stats[key].cpu) ? stats[key].cpu : 0;
|
||||
} else {
|
||||
this.logger.debug(`Process ${key} stats are null (process may have exited)`);
|
||||
}
|
||||
}
|
||||
|
||||
this.logger.debug(
|
||||
`Total memory for process group: ${this.humanReadableBytes(totalMemory)}`,
|
||||
);
|
||||
|
||||
resolve({ memory: totalMemory, cpu: totalCpu });
|
||||
},
|
||||
);
|
||||
@@ -387,6 +475,9 @@ export class ProcessMonitor extends EventEmitter {
|
||||
this.log('Stopping process monitor.');
|
||||
this.stopped = true;
|
||||
|
||||
// Clean up event listeners
|
||||
this.cleanupListeners();
|
||||
|
||||
// Flush logs to disk before stopping
|
||||
if (this.processId && this.logs.length > 0) {
|
||||
try {
|
||||
|
||||
@@ -23,6 +23,13 @@ export class ProcessWrapper extends EventEmitter {
|
||||
private runId: string = '';
|
||||
private stdoutRemainder: string = '';
|
||||
private stderrRemainder: string = '';
|
||||
// Store event handlers for cleanup
|
||||
private exitHandler?: (code: number | null, signal: string | null) => void;
|
||||
private errorHandler?: (error: Error) => void;
|
||||
private stdoutDataHandler?: (data: Buffer) => void;
|
||||
private stdoutEndHandler?: () => void;
|
||||
private stderrDataHandler?: (data: Buffer) => void;
|
||||
private stderrEndHandler?: () => void;
|
||||
|
||||
// Helper: send a signal to the process and all its children (best-effort)
|
||||
private async killProcessTree(signal: NodeJS.Signals): Promise<void> {
|
||||
@@ -84,7 +91,7 @@ export class ProcessWrapper extends EventEmitter {
|
||||
this.startTime = new Date();
|
||||
|
||||
// Handle process exit
|
||||
this.process.on('exit', (code, signal) => {
|
||||
this.exitHandler = (code, signal) => {
|
||||
const exitMessage = `Process exited with code ${code}, signal ${signal}`;
|
||||
this.logger.info(exitMessage);
|
||||
this.addSystemLog(exitMessage);
|
||||
@@ -97,10 +104,11 @@ export class ProcessWrapper extends EventEmitter {
|
||||
this.process = null;
|
||||
|
||||
this.emit('exit', code, signal);
|
||||
});
|
||||
};
|
||||
this.process.on('exit', this.exitHandler);
|
||||
|
||||
// Handle errors
|
||||
this.process.on('error', (error) => {
|
||||
this.errorHandler = (error) => {
|
||||
const processError = new ProcessError(
|
||||
error.message,
|
||||
'ERR_PROCESS_EXECUTION',
|
||||
@@ -109,7 +117,8 @@ export class ProcessWrapper extends EventEmitter {
|
||||
this.logger.error(processError);
|
||||
this.addSystemLog(`Process error: ${processError.toString()}`);
|
||||
this.emit('error', processError);
|
||||
});
|
||||
};
|
||||
this.process.on('error', this.errorHandler);
|
||||
|
||||
// Capture stdout
|
||||
if (this.process.stdout) {
|
||||
@@ -118,7 +127,7 @@ export class ProcessWrapper extends EventEmitter {
|
||||
`[ProcessWrapper] Setting up stdout listener for process ${this.process.pid}`,
|
||||
);
|
||||
}
|
||||
this.process.stdout.on('data', (data) => {
|
||||
this.stdoutDataHandler = (data) => {
|
||||
if (process.env.TSPM_DEBUG) {
|
||||
console.error(
|
||||
`[ProcessWrapper] Received stdout data from PID ${this.process?.pid}: ${data
|
||||
@@ -141,23 +150,25 @@ export class ProcessWrapper extends EventEmitter {
|
||||
this.logger.debug(`Captured stdout: ${line}`);
|
||||
this.addLog('stdout', line);
|
||||
}
|
||||
});
|
||||
};
|
||||
this.process.stdout.on('data', this.stdoutDataHandler);
|
||||
|
||||
// Flush remainder on stream end
|
||||
this.process.stdout.on('end', () => {
|
||||
this.stdoutEndHandler = () => {
|
||||
if (this.stdoutRemainder) {
|
||||
this.logger.debug(`Flushing stdout remainder: ${this.stdoutRemainder}`);
|
||||
this.addLog('stdout', this.stdoutRemainder);
|
||||
this.stdoutRemainder = '';
|
||||
}
|
||||
});
|
||||
};
|
||||
this.process.stdout.on('end', this.stdoutEndHandler);
|
||||
} else {
|
||||
this.logger.warn('Process stdout is null');
|
||||
}
|
||||
|
||||
// Capture stderr
|
||||
if (this.process.stderr) {
|
||||
this.process.stderr.on('data', (data) => {
|
||||
this.stderrDataHandler = (data) => {
|
||||
// Add data to remainder buffer and split by newlines
|
||||
const text = this.stderrRemainder + data.toString();
|
||||
const lines = text.split('\n');
|
||||
@@ -169,15 +180,17 @@ export class ProcessWrapper extends EventEmitter {
|
||||
for (const line of lines) {
|
||||
this.addLog('stderr', line);
|
||||
}
|
||||
});
|
||||
};
|
||||
this.process.stderr.on('data', this.stderrDataHandler);
|
||||
|
||||
// Flush remainder on stream end
|
||||
this.process.stderr.on('end', () => {
|
||||
this.stderrEndHandler = () => {
|
||||
if (this.stderrRemainder) {
|
||||
this.addLog('stderr', this.stderrRemainder);
|
||||
this.stderrRemainder = '';
|
||||
}
|
||||
});
|
||||
};
|
||||
this.process.stderr.on('end', this.stderrEndHandler);
|
||||
}
|
||||
|
||||
this.addSystemLog(`Process started with PID ${this.process.pid}`);
|
||||
@@ -200,6 +213,46 @@ export class ProcessWrapper extends EventEmitter {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clean up event listeners from process and streams
|
||||
*/
|
||||
private cleanupListeners(): void {
|
||||
if (this.process) {
|
||||
if (this.exitHandler) {
|
||||
this.process.removeListener('exit', this.exitHandler);
|
||||
}
|
||||
if (this.errorHandler) {
|
||||
this.process.removeListener('error', this.errorHandler);
|
||||
}
|
||||
|
||||
if (this.process.stdout) {
|
||||
if (this.stdoutDataHandler) {
|
||||
this.process.stdout.removeListener('data', this.stdoutDataHandler);
|
||||
}
|
||||
if (this.stdoutEndHandler) {
|
||||
this.process.stdout.removeListener('end', this.stdoutEndHandler);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.process.stderr) {
|
||||
if (this.stderrDataHandler) {
|
||||
this.process.stderr.removeListener('data', this.stderrDataHandler);
|
||||
}
|
||||
if (this.stderrEndHandler) {
|
||||
this.process.stderr.removeListener('end', this.stderrEndHandler);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Clear references
|
||||
this.exitHandler = undefined;
|
||||
this.errorHandler = undefined;
|
||||
this.stdoutDataHandler = undefined;
|
||||
this.stdoutEndHandler = undefined;
|
||||
this.stderrDataHandler = undefined;
|
||||
this.stderrEndHandler = undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop the wrapped process
|
||||
*/
|
||||
@@ -210,6 +263,9 @@ export class ProcessWrapper extends EventEmitter {
|
||||
return;
|
||||
}
|
||||
|
||||
// Clean up event listeners before stopping
|
||||
this.cleanupListeners();
|
||||
|
||||
this.logger.info('Stopping process...');
|
||||
this.addSystemLog('Stopping process...');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user