repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: add error handling to worker set worker
[e-mobility-charging-stations-simulator.git]
/
src
/
worker
/
WorkerSet.ts
diff --git
a/src/worker/WorkerSet.ts
b/src/worker/WorkerSet.ts
index a2e6faf02fbf04063256cbd1533f80f7ce3bef68..19ed8393f171a64d37e4e3d3e871cacf81f17539 100644
(file)
--- a/
src/worker/WorkerSet.ts
+++ b/
src/worker/WorkerSet.ts
@@
-3,6
+3,8
@@
import { EventEmitter } from 'node:events';
import { SHARE_ENV, Worker } from 'node:worker_threads';
import { EventEmitter } from 'node:events';
import { SHARE_ENV, Worker } from 'node:worker_threads';
+import type { ThreadPoolOptions } from 'poolifier';
+
import { WorkerAbstract } from './WorkerAbstract';
import { WorkerConstants } from './WorkerConstants';
import {
import { WorkerAbstract } from './WorkerAbstract';
import { WorkerConstants } from './WorkerConstants';
import {
@@
-15,8
+17,13
@@
import {
} from './WorkerTypes';
import { sleep } from './WorkerUtils';
} from './WorkerTypes';
import { sleep } from './WorkerUtils';
+const DEFAULT_POOL_OPTIONS: ThreadPoolOptions = {
+ enableEvents: true,
+ restartWorkerOnError: true,
+};
+
export class WorkerSet extends WorkerAbstract<WorkerData> {
export class WorkerSet extends WorkerAbstract<WorkerData> {
- public readonly emitter: EventEmitter;
+ public readonly emitter
!
: EventEmitter;
private readonly workerSet: Set<WorkerSetElement>;
/**
private readonly workerSet: Set<WorkerSetElement>;
/**
@@
-25,17
+32,14
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
* @param workerScript -
* @param workerOptions -
*/
* @param workerScript -
* @param workerOptions -
*/
- constructor(workerScript: string, workerOptions
?
: WorkerOptions) {
+ constructor(workerScript: string, workerOptions: WorkerOptions) {
super(workerScript, workerOptions);
this.workerOptions.poolOptions = {
super(workerScript, workerOptions);
this.workerOptions.poolOptions = {
- ...{
- enableEvents: true,
- restartWorkerOnError: true,
- },
+ ...DEFAULT_POOL_OPTIONS,
...this.workerOptions.poolOptions,
};
this.workerSet = new Set<WorkerSetElement>();
...this.workerOptions.poolOptions,
};
this.workerSet = new Set<WorkerSetElement>();
- if (this.workerOptions
?
.poolOptions?.enableEvents) {
+ if (this.workerOptions.poolOptions?.enableEvents) {
this.emitter = new EventEmitter();
}
}
this.emitter = new EventEmitter();
}
}
@@
-48,9
+52,9
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
size: this.size,
elementsExecuting: [...this.workerSet].reduce(
(accumulator, workerSetElement) => accumulator + workerSetElement.numberOfWorkerElements,
size: this.size,
elementsExecuting: [...this.workerSet].reduce(
(accumulator, workerSetElement) => accumulator + workerSetElement.numberOfWorkerElements,
- 0
+ 0
,
),
),
- elementsPerWorker: this.maxElementsPerWorker,
+ elementsPerWorker: this.maxElementsPerWorker
!
,
};
}
};
}
@@
-66,13
+70,19
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
public async start(): Promise<void> {
this.addWorkerSetElement();
// Add worker set element sequentially to optimize memory at startup
public async start(): Promise<void> {
this.addWorkerSetElement();
// Add worker set element sequentially to optimize memory at startup
- this.workerOptions.workerStartDelay
> 0 && (await sleep(this.workerOptions.workerStartDelay
));
+ this.workerOptions.workerStartDelay
! > 0 && (await sleep(this.workerOptions.workerStartDelay!
));
}
/** @inheritDoc */
public async stop(): Promise<void> {
for (const workerSetElement of this.workerSet) {
}
/** @inheritDoc */
public async stop(): Promise<void> {
for (const workerSetElement of this.workerSet) {
+ const workerExitPromise = new Promise<void>((resolve) => {
+ workerSetElement.worker.on('exit', () => {
+ resolve();
+ });
+ });
await workerSetElement.worker.terminate();
await workerSetElement.worker.terminate();
+ await workerExitPromise;
}
this.workerSet.clear();
}
}
this.workerSet.clear();
}
@@
-84,13
+94,13
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
}
const workerSetElement = await this.getWorkerSetElement();
workerSetElement.worker.postMessage({
}
const workerSetElement = await this.getWorkerSetElement();
workerSetElement.worker.postMessage({
-
id
: WorkerMessageEvents.startWorkerElement,
+
event
: WorkerMessageEvents.startWorkerElement,
data: elementData,
});
++workerSetElement.numberOfWorkerElements;
// Add element sequentially to optimize memory at startup
data: elementData,
});
++workerSetElement.numberOfWorkerElements;
// Add element sequentially to optimize memory at startup
- if (this.workerOptions.elementStartDelay > 0) {
- await sleep(this.workerOptions.elementStartDelay);
+ if (this.workerOptions.elementStartDelay
!
> 0) {
+ await sleep(this.workerOptions.elementStartDelay
!
);
}
}
}
}
@@
-100,42
+110,46
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
private addWorkerSetElement(): WorkerSetElement {
const worker = new Worker(this.workerScript, {
env: SHARE_ENV,
private addWorkerSetElement(): WorkerSetElement {
const worker = new Worker(this.workerScript, {
env: SHARE_ENV,
- ...this.workerOptions.poolOptions.workerOptions,
+ ...this.workerOptions.poolOptions
?
.workerOptions,
});
worker.on(
'message',
});
worker.on(
'message',
- this.workerOptions
?.poolOptions?.messageHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions
.poolOptions?.messageHandler ?? WorkerConstants.EMPTY_FUNCTION,
);
worker.on(
'error',
);
worker.on(
'error',
- this.workerOptions
?.poolOptions?.errorHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions
.poolOptions?.errorHandler ?? WorkerConstants.EMPTY_FUNCTION,
);
worker.on('error', (error) => {
);
worker.on('error', (error) => {
- if (this.emitter !== undefined) {
- this.emitter.emit(WorkerSetEvents.error, error);
- }
- if (this.workerOptions?.poolOptions?.restartWorkerOnError) {
+ this.emitter?.emit(WorkerSetEvents.error, error);
+ if (this.workerOptions.poolOptions?.restartWorkerOnError) {
this.addWorkerSetElement();
}
});
worker.on(
'online',
this.addWorkerSetElement();
}
});
worker.on(
'online',
- this.workerOptions
?.poolOptions?.onlineHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions
.poolOptions?.onlineHandler ?? WorkerConstants.EMPTY_FUNCTION,
);
worker.on(
'exit',
);
worker.on(
'exit',
- this.workerOptions?.poolOptions?.exitHandler ?? WorkerConstants.EMPTY_FUNCTION
+ this.workerOptions.poolOptions?.exitHandler ?? WorkerConstants.EMPTY_FUNCTION,
+ );
+ worker.once('exit', () =>
+ this.removeWorkerSetElement(this.getWorkerSetElementByWorker(worker)!),
);
);
- worker.once('exit', () => this.workerSet.delete(this.getWorkerSetElementByWorker(worker)));
const workerSetElement: WorkerSetElement = { worker, numberOfWorkerElements: 0 };
this.workerSet.add(workerSetElement);
return workerSetElement;
}
const workerSetElement: WorkerSetElement = { worker, numberOfWorkerElements: 0 };
this.workerSet.add(workerSetElement);
return workerSetElement;
}
+ private removeWorkerSetElement(workerSetElement: WorkerSetElement): void {
+ this.workerSet.delete(workerSetElement);
+ }
+
private async getWorkerSetElement(): Promise<WorkerSetElement> {
private async getWorkerSetElement(): Promise<WorkerSetElement> {
- let chosenWorkerSetElement: WorkerSetElement;
+ let chosenWorkerSetElement: WorkerSetElement
| undefined
;
for (const workerSetElement of this.workerSet) {
for (const workerSetElement of this.workerSet) {
- if (workerSetElement.numberOfWorkerElements < this.workerOptions.elementsPerWorker) {
+ if (workerSetElement.numberOfWorkerElements < this.workerOptions.elementsPerWorker
!
) {
chosenWorkerSetElement = workerSetElement;
break;
}
chosenWorkerSetElement = workerSetElement;
break;
}
@@
-143,13
+157,14
@@
export class WorkerSet extends WorkerAbstract<WorkerData> {
if (!chosenWorkerSetElement) {
chosenWorkerSetElement = this.addWorkerSetElement();
// Add worker set element sequentially to optimize memory at startup
if (!chosenWorkerSetElement) {
chosenWorkerSetElement = this.addWorkerSetElement();
// Add worker set element sequentially to optimize memory at startup
- this.workerOptions.workerStartDelay > 0 && (await sleep(this.workerOptions.workerStartDelay));
+ this.workerOptions.workerStartDelay! > 0 &&
+ (await sleep(this.workerOptions.workerStartDelay!));
}
return chosenWorkerSetElement;
}
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement | undefined {
}
return chosenWorkerSetElement;
}
private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement | undefined {
- let workerSetElt: WorkerSetElement;
+ let workerSetElt: WorkerSetElement
| undefined
;
for (const workerSetElement of this.workerSet) {
if (workerSetElement.worker.threadId === worker.threadId) {
workerSetElt = workerSetElement;
for (const workerSetElement of this.workerSet) {
if (workerSetElement.worker.threadId === worker.threadId) {
workerSetElt = workerSetElement;