X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fabstract-worker.ts;h=3718964a1b1de8d14abc2bfd8c09769eefd663f8;hb=b6dbd509bb07898a0639612d63a4b7a6aacc5851;hp=56a7696f0638fabaaccd7eb4100b7d19e358f0cd;hpb=1e3214b63e262557aadebf3c57e8388de6a4bbe4;p=poolifier.git diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index 56a7696f..3718964a 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -137,6 +137,11 @@ export abstract class AbstractWorker< 'A taskFunctions parameter object key is not a string' ) } + if (typeof name === 'string' && name.trim().length === 0) { + throw new TypeError( + 'A taskFunctions parameter object key an empty string' + ) + } if (typeof fn !== 'function') { throw new TypeError( 'A taskFunctions parameter object value is not a function' @@ -170,6 +175,9 @@ export abstract class AbstractWorker< if (typeof name !== 'string') { throw new TypeError('name parameter is not a string') } + if (typeof name === 'string' && name.trim().length === 0) { + throw new TypeError('name parameter is an empty string') + } return this.taskFunctions.has(name) } @@ -191,6 +199,9 @@ export abstract class AbstractWorker< if (typeof name !== 'string') { throw new TypeError('name parameter is not a string') } + if (typeof name === 'string' && name.trim().length === 0) { + throw new TypeError('name parameter is an empty string') + } if (name === DEFAULT_TASK_NAME) { throw new Error( 'Cannot add a task function with the default reserved name' @@ -208,6 +219,7 @@ export abstract class AbstractWorker< this.taskFunctions.set(DEFAULT_TASK_NAME, boundFn) } this.taskFunctions.set(name, boundFn) + this.sendTaskFunctionsListToMainWorker() return true } catch { return false @@ -227,6 +239,9 @@ export abstract class AbstractWorker< if (typeof name !== 'string') { throw new TypeError('name parameter is not a string') } + if (typeof name === 'string' && name.trim().length === 0) { + throw new TypeError('name parameter is an empty string') + } if (name === DEFAULT_TASK_NAME) { throw new Error( 'Cannot remove the task function with the default reserved name' @@ -239,7 +254,9 @@ export abstract class AbstractWorker< 'Cannot remove the task function used as the default task function' ) } - return this.taskFunctions.delete(name) + const deleteStatus = this.taskFunctions.delete(name) + this.sendTaskFunctionsListToMainWorker() + return deleteStatus } /** @@ -264,6 +281,9 @@ export abstract class AbstractWorker< if (typeof name !== 'string') { throw new TypeError('name parameter is not a string') } + if (typeof name === 'string' && name.trim().length === 0) { + throw new TypeError('name parameter is an empty string') + } if (name === DEFAULT_TASK_NAME) { throw new Error( 'Cannot set the default task function reserved name as the default task function' @@ -301,7 +321,9 @@ export abstract class AbstractWorker< if (this.isMain) { throw new Error('Cannot handle message to worker in main worker') } else if (message.workerId != null && message.workerId !== this.id) { - throw new Error('Message worker id does not match the worker id') + throw new Error( + `Message worker id ${message.workerId} does not match the worker id ${this.id}` + ) } else if (message.workerId === this.id) { if (message.statistics != null) { // Statistics message received @@ -344,7 +366,7 @@ export abstract class AbstractWorker< // eslint-disable-next-line @typescript-eslint/no-invalid-void-type this.opts.killHandler?.() as void this.sendToMainWorker({ kill: 'success', workerId: this.id }) - } catch (error) { + } catch { this.sendToMainWorker({ kill: 'failure', workerId: this.id }) } finally { this.emitDestroy() @@ -406,6 +428,16 @@ export abstract class AbstractWorker< message: MessageValue ): void + /** + * Sends the list of task function names to the main worker. + */ + protected sendTaskFunctionsListToMainWorker (): void { + this.sendToMainWorker({ + taskFunctions: this.listTaskFunctions(), + workerId: this.id + }) + } + /** * Handles an error and convert it to a string so it can be sent back to the main worker. *