@git.zone/tswatch 3.2.1 → 3.2.3
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/dist_ts/tswatch.classes.tswatch.js +8 -1
- package/dist_ts/tswatch.classes.watcher.d.ts +2 -1
- package/dist_ts/tswatch.classes.watcher.js +7 -26
- package/dist_ts/tswatch.plugins.d.ts +2 -1
- package/dist_ts/tswatch.plugins.js +3 -2
- package/package.json +3 -2
- package/ts/tswatch.classes.tswatch.ts +8 -0
- package/ts/tswatch.classes.watcher.ts +6 -25
- package/ts/tswatch.plugins.ts +2 -0
|
@@ -36,6 +36,13 @@ export class TsWatch {
|
|
|
36
36
|
*/
|
|
37
37
|
async start() {
|
|
38
38
|
logger.log('info', 'Starting tswatch with config-driven mode');
|
|
39
|
+
// Install global process lifecycle handlers (SIGINT, SIGTERM, etc.)
|
|
40
|
+
// This is the single authority for signal handling — no per-watcher handlers.
|
|
41
|
+
plugins.smartexit.ProcessLifecycle.install();
|
|
42
|
+
const exitInstance = new plugins.smartexit.SmartExit({ silent: true });
|
|
43
|
+
exitInstance.addCleanupFunction(async () => {
|
|
44
|
+
await this.stop();
|
|
45
|
+
});
|
|
39
46
|
// Start server if configured
|
|
40
47
|
if (this.config.server?.enabled) {
|
|
41
48
|
await this.startServer();
|
|
@@ -179,4 +186,4 @@ export class TsWatch {
|
|
|
179
186
|
});
|
|
180
187
|
}
|
|
181
188
|
}
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tswatch.classes.tswatch.js","sourceRoot":"","sources":["../ts/tswatch.classes.tswatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,8 @@ export declare class Watcher {
|
|
|
53
53
|
*/
|
|
54
54
|
private executeCommand;
|
|
55
55
|
/**
|
|
56
|
-
*
|
|
56
|
+
* Sets up timeout-based cleanup if configured.
|
|
57
|
+
* Signal handling (SIGINT/SIGTERM) is managed globally by ProcessLifecycle in TsWatch.
|
|
57
58
|
*/
|
|
58
59
|
private setupCleanup;
|
|
59
60
|
/**
|
|
@@ -136,34 +136,13 @@ export class Watcher {
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
/**
|
|
139
|
-
*
|
|
139
|
+
* Sets up timeout-based cleanup if configured.
|
|
140
|
+
* Signal handling (SIGINT/SIGTERM) is managed globally by ProcessLifecycle in TsWatch.
|
|
140
141
|
*/
|
|
141
142
|
async setupCleanup() {
|
|
142
|
-
// Last-resort synchronous cleanup — 'exit' event cannot await async work.
|
|
143
|
-
// By this point, SIGINT handler should have already called stop().
|
|
144
|
-
process.on('exit', () => {
|
|
145
|
-
if (this.currentExecution && !this.currentExecution.childProcess.killed) {
|
|
146
|
-
const pid = this.currentExecution.childProcess.pid;
|
|
147
|
-
if (pid) {
|
|
148
|
-
try {
|
|
149
|
-
process.kill(pid, 'SIGKILL');
|
|
150
|
-
}
|
|
151
|
-
catch {
|
|
152
|
-
// Process may already be dead
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
});
|
|
157
|
-
process.on('SIGINT', async () => {
|
|
158
|
-
console.log('');
|
|
159
|
-
console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
|
|
160
|
-
await this.stop();
|
|
161
|
-
process.exit(0);
|
|
162
|
-
});
|
|
163
|
-
// handle timeout
|
|
164
143
|
if (this.options.timeout) {
|
|
165
144
|
plugins.smartdelay.delayFor(this.options.timeout).then(async () => {
|
|
166
|
-
console.log(`timed out
|
|
145
|
+
console.log(`timed out after ${this.options.timeout} milliseconds! exiting!`);
|
|
167
146
|
await this.stop();
|
|
168
147
|
process.exit(0);
|
|
169
148
|
});
|
|
@@ -177,9 +156,11 @@ export class Watcher {
|
|
|
177
156
|
clearTimeout(this.debounceTimer);
|
|
178
157
|
}
|
|
179
158
|
await this.smartwatchInstance.stop();
|
|
180
|
-
if (this.currentExecution
|
|
159
|
+
if (this.currentExecution) {
|
|
160
|
+
// Always tree-kill — even if the direct child is dead (.killed === true),
|
|
161
|
+
// grandchildren (e.g. tsrun, devserver) may still be running.
|
|
181
162
|
await this.currentExecution.kill();
|
|
182
163
|
}
|
|
183
164
|
}
|
|
184
165
|
}
|
|
185
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5jbGFzc2VzLndhdGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90c3dhdGNoLmNsYXNzZXMud2F0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBcUI5Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxPQUFPO0lBZWxCLFlBQVksVUFBc0M7UUFkbEQ7O1dBRUc7UUFDSyx1QkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO1lBQzdELFFBQVEsRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQztRQUdLLHVCQUFrQixHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFM0Qsa0JBQWEsR0FBMEIsSUFBSSxDQUFDO1FBQzVDLGdCQUFXLEdBQUcsS0FBSyxDQUFDO1FBQ3BCLHFCQUFnQixHQUFHLEtBQUssQ0FBQztRQUcvQixJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ2IsT0FBTyxFQUFFLElBQUk7WUFDYixRQUFRLEVBQUUsR0FBRztZQUNiLFVBQVUsRUFBRSxJQUFJO1lBQ2hCLEdBQUcsVUFBVTtTQUNkLENBQUM7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQWlDO1FBQ3hELE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMvRSxPQUFPLElBQUksT0FBTyxDQUFDO1lBQ2pCLElBQUksRUFBRSxNQUFN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
|
|
@@ -8,6 +8,7 @@ import * as lik from '@push.rocks/lik';
|
|
|
8
8
|
import * as npmextra from '@push.rocks/npmextra';
|
|
9
9
|
import * as smartcli from '@push.rocks/smartcli';
|
|
10
10
|
import * as smartdelay from '@push.rocks/smartdelay';
|
|
11
|
+
import * as smartexit from '@push.rocks/smartexit';
|
|
11
12
|
import * as smartfs from '@push.rocks/smartfs';
|
|
12
13
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
13
14
|
import * as smartlog from '@push.rocks/smartlog';
|
|
@@ -15,4 +16,4 @@ import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-loca
|
|
|
15
16
|
import * as smartshell from '@push.rocks/smartshell';
|
|
16
17
|
import * as smartwatch from '@push.rocks/smartwatch';
|
|
17
18
|
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
18
|
-
export { lik, npmextra, smartcli, smartdelay, smartfs, smartinteract, smartlog, smartlogDestinationLocal, smartshell, smartwatch, taskbuffer, };
|
|
19
|
+
export { lik, npmextra, smartcli, smartdelay, smartexit, smartfs, smartinteract, smartlog, smartlogDestinationLocal, smartshell, smartwatch, taskbuffer, };
|
|
@@ -12,6 +12,7 @@ import * as lik from '@push.rocks/lik';
|
|
|
12
12
|
import * as npmextra from '@push.rocks/npmextra';
|
|
13
13
|
import * as smartcli from '@push.rocks/smartcli';
|
|
14
14
|
import * as smartdelay from '@push.rocks/smartdelay';
|
|
15
|
+
import * as smartexit from '@push.rocks/smartexit';
|
|
15
16
|
import * as smartfs from '@push.rocks/smartfs';
|
|
16
17
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
17
18
|
import * as smartlog from '@push.rocks/smartlog';
|
|
@@ -19,5 +20,5 @@ import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-loca
|
|
|
19
20
|
import * as smartshell from '@push.rocks/smartshell';
|
|
20
21
|
import * as smartwatch from '@push.rocks/smartwatch';
|
|
21
22
|
import * as taskbuffer from '@push.rocks/taskbuffer';
|
|
22
|
-
export { lik, npmextra, smartcli, smartdelay, smartfs, smartinteract, smartlog, smartlogDestinationLocal, smartshell, smartwatch, taskbuffer, };
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
export { lik, npmextra, smartcli, smartdelay, smartexit, smartfs, smartinteract, smartlog, smartlogDestinationLocal, smartshell, smartwatch, taskbuffer, };
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHN3YXRjaC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdHN3YXRjaC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7QUFFaEIsa0JBQWtCO0FBQ2xCLE9BQU8sS0FBSyxRQUFRLE1BQU0sb0JBQW9CLENBQUM7QUFDL0MsT0FBTyxFQUFFLFFBQVEsRUFBRSxDQUFDO0FBRXBCLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FBQztBQUV2QixvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQztBQUN2QyxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFDL0MsT0FBTyxLQUFLLGFBQWEsTUFBTSwyQkFBMkIsQ0FBQztBQUMzRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyx3QkFBd0IsTUFBTSx3Q0FBd0MsQ0FBQztBQUNuRixPQUFPLEtBQUssVUFBVSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEVBQ0wsR0FBRyxFQUNILFFBQVEsRUFDUixRQUFRLEVBQ1IsVUFBVSxFQUNWLFNBQVMsRUFDVCxPQUFPLEVBQ1AsYUFBYSxFQUNiLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsVUFBVSxFQUNWLFVBQVUsRUFDVixVQUFVLEdBQ1gsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tswatch",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A development tool for automatically watching and re-compiling TypeScript projects upon detecting file changes, enhancing developer workflows.",
|
|
6
6
|
"exports": {
|
|
@@ -31,11 +31,12 @@
|
|
|
31
31
|
"@push.rocks/npmextra": "^5.3.3",
|
|
32
32
|
"@push.rocks/smartcli": "^4.0.20",
|
|
33
33
|
"@push.rocks/smartdelay": "^3.0.5",
|
|
34
|
+
"@push.rocks/smartexit": "2.0.0",
|
|
34
35
|
"@push.rocks/smartfs": "^1.3.1",
|
|
35
36
|
"@push.rocks/smartinteract": "^2.0.16",
|
|
36
37
|
"@push.rocks/smartlog": "^3.1.10",
|
|
37
38
|
"@push.rocks/smartlog-destination-local": "^9.0.2",
|
|
38
|
-
"@push.rocks/smartshell": "^3.3.
|
|
39
|
+
"@push.rocks/smartshell": "^3.3.3",
|
|
39
40
|
"@push.rocks/smartwatch": "^6.3.0",
|
|
40
41
|
"@push.rocks/taskbuffer": "^4.2.0"
|
|
41
42
|
},
|
|
@@ -46,6 +46,14 @@ export class TsWatch {
|
|
|
46
46
|
public async start() {
|
|
47
47
|
logger.log('info', 'Starting tswatch with config-driven mode');
|
|
48
48
|
|
|
49
|
+
// Install global process lifecycle handlers (SIGINT, SIGTERM, etc.)
|
|
50
|
+
// This is the single authority for signal handling — no per-watcher handlers.
|
|
51
|
+
plugins.smartexit.ProcessLifecycle.install();
|
|
52
|
+
const exitInstance = new plugins.smartexit.SmartExit({ silent: true });
|
|
53
|
+
exitInstance.addCleanupFunction(async () => {
|
|
54
|
+
await this.stop();
|
|
55
|
+
});
|
|
56
|
+
|
|
49
57
|
// Start server if configured
|
|
50
58
|
if (this.config.server?.enabled) {
|
|
51
59
|
await this.startServer();
|
|
@@ -181,34 +181,13 @@ export class Watcher {
|
|
|
181
181
|
}
|
|
182
182
|
|
|
183
183
|
/**
|
|
184
|
-
*
|
|
184
|
+
* Sets up timeout-based cleanup if configured.
|
|
185
|
+
* Signal handling (SIGINT/SIGTERM) is managed globally by ProcessLifecycle in TsWatch.
|
|
185
186
|
*/
|
|
186
187
|
private async setupCleanup() {
|
|
187
|
-
// Last-resort synchronous cleanup — 'exit' event cannot await async work.
|
|
188
|
-
// By this point, SIGINT handler should have already called stop().
|
|
189
|
-
process.on('exit', () => {
|
|
190
|
-
if (this.currentExecution && !this.currentExecution.childProcess.killed) {
|
|
191
|
-
const pid = this.currentExecution.childProcess.pid;
|
|
192
|
-
if (pid) {
|
|
193
|
-
try {
|
|
194
|
-
process.kill(pid, 'SIGKILL');
|
|
195
|
-
} catch {
|
|
196
|
-
// Process may already be dead
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
});
|
|
201
|
-
process.on('SIGINT', async () => {
|
|
202
|
-
console.log('');
|
|
203
|
-
console.log('ok! got SIGINT We are exiting! Just cleaning up to exit neatly :)');
|
|
204
|
-
await this.stop();
|
|
205
|
-
process.exit(0);
|
|
206
|
-
});
|
|
207
|
-
|
|
208
|
-
// handle timeout
|
|
209
188
|
if (this.options.timeout) {
|
|
210
189
|
plugins.smartdelay.delayFor(this.options.timeout).then(async () => {
|
|
211
|
-
console.log(`timed out
|
|
190
|
+
console.log(`timed out after ${this.options.timeout} milliseconds! exiting!`);
|
|
212
191
|
await this.stop();
|
|
213
192
|
process.exit(0);
|
|
214
193
|
});
|
|
@@ -223,7 +202,9 @@ export class Watcher {
|
|
|
223
202
|
clearTimeout(this.debounceTimer);
|
|
224
203
|
}
|
|
225
204
|
await this.smartwatchInstance.stop();
|
|
226
|
-
if (this.currentExecution
|
|
205
|
+
if (this.currentExecution) {
|
|
206
|
+
// Always tree-kill — even if the direct child is dead (.killed === true),
|
|
207
|
+
// grandchildren (e.g. tsrun, devserver) may still be running.
|
|
227
208
|
await this.currentExecution.kill();
|
|
228
209
|
}
|
|
229
210
|
}
|
package/ts/tswatch.plugins.ts
CHANGED
|
@@ -16,6 +16,7 @@ import * as lik from '@push.rocks/lik';
|
|
|
16
16
|
import * as npmextra from '@push.rocks/npmextra';
|
|
17
17
|
import * as smartcli from '@push.rocks/smartcli';
|
|
18
18
|
import * as smartdelay from '@push.rocks/smartdelay';
|
|
19
|
+
import * as smartexit from '@push.rocks/smartexit';
|
|
19
20
|
import * as smartfs from '@push.rocks/smartfs';
|
|
20
21
|
import * as smartinteract from '@push.rocks/smartinteract';
|
|
21
22
|
import * as smartlog from '@push.rocks/smartlog';
|
|
@@ -29,6 +30,7 @@ export {
|
|
|
29
30
|
npmextra,
|
|
30
31
|
smartcli,
|
|
31
32
|
smartdelay,
|
|
33
|
+
smartexit,
|
|
32
34
|
smartfs,
|
|
33
35
|
smartinteract,
|
|
34
36
|
smartlog,
|