Compare commits

...

4 Commits

Author SHA1 Message Date
073685e683 1.0.41 2020-05-22 00:53:11 +00:00
b91b3e0a0c fix(core): update 2020-05-22 00:53:11 +00:00
12d31533f5 1.0.40 2020-05-22 00:46:13 +00:00
f9b8a356e4 fix(core): update 2020-05-22 00:46:12 +00:00
3 changed files with 4 additions and 20 deletions

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tswatch", "name": "@gitzone/tswatch",
"version": "1.0.39", "version": "1.0.41",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "@gitzone/tswatch", "name": "@gitzone/tswatch",
"version": "1.0.39", "version": "1.0.41",
"private": false, "private": false,
"description": "watch typescript projects during development", "description": "watch typescript projects during development",
"main": "dist/index.js", "main": "dist/index.js",

View File

@@ -20,21 +20,6 @@ export class Watcher {
executor: 'bash' executor: 'bash'
}); });
/**
* used to execute
*/
private executionTask: plugins.taskbuffer.Task = new plugins.taskbuffer.Task({
name: 'watcherCommandFunctionTask',
taskFunction: async () => {
if (typeof this.options.commandToExecute === 'string') {
throw new Error('cannot execute string as task');
}
await this.options.commandToExecute();
},
buffered: true,
bufferMax: 1
});
private currentExecution: plugins.smartshell.IExecResultStreaming; private currentExecution: plugins.smartshell.IExecResultStreaming;
private smartchokWatcher = new plugins.smartchok.Smartchok([], {}); private smartchokWatcher = new plugins.smartchok.Smartchok([], {});
private options: IWatcherConstructorOptions; private options: IWatcherConstructorOptions;
@@ -65,16 +50,15 @@ export class Watcher {
if (typeof this.options.commandToExecute === 'string') { if (typeof this.options.commandToExecute === 'string') {
if (this.currentExecution) { if (this.currentExecution) {
logger.log('ok', `reexecuting ${this.options.commandToExecute}`); logger.log('ok', `reexecuting ${this.options.commandToExecute}`);
process.kill(-this.currentExecution.childProcess.pid); process.kill(this.currentExecution.childProcess.pid, 'SIGINT');
} else { } else {
logger.log('ok', `executing ${this.options.commandToExecute} for the first time`); logger.log('ok', `executing ${this.options.commandToExecute} for the first time`);
} }
this.currentExecution = await this.smartshellInstance.execStreaming( this.currentExecution = await this.smartshellInstance.execStreaming(
this.options.commandToExecute this.options.commandToExecute
); );
this.currentExecution = null;
} else { } else {
await this.executionTask.trigger(); console.log('cannot run execution task');
} }
} }