Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-09-10 17:53:36 +02:00
Code Issues Projects Releases Wiki Activity

fix: tear down also event handlers in addon service

Browse Source
This commit is contained in:
sjaanus 2025-07-03 11:17:51 +03:00
parent 2abbf976fe
commit bfbdc1f65a
No known key found for this signature in database
GPG Key ID: 20E007C0248BA7FF
2 changed files with 70 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/features/events/event-service.ts
View File

@ -110,6 +110,13 @@ export default class EventService {
return this.eventStore.on(eventName, listener); return this.eventStore.on(eventName, listener);
} }
off(
eventName: string | symbol,
listener: (...args: any[]) => void,
): EventEmitter {
return this.eventStore.off(eventName, listener);
}
private async enhanceEventsWithTags( private async enhanceEventsWithTags(
events: IBaseEvent[], events: IBaseEvent[],
): Promise<IBaseEvent[]> { ): Promise<IBaseEvent[]> {

94
src/lib/services/addon-service.ts
View File

@ -59,6 +59,8 @@ export default class AddonService {
fetchAddonConfigs: (() => Promise<IAddon[]>) & fetchAddonConfigs: (() => Promise<IAddon[]>) &
memoizee.Memoized<() => Promise<IAddon[]>>; memoizee.Memoized<() => Promise<IAddon[]>>;
private eventHandlers: Map<string, (event: IEvent) => void>;
constructor( constructor(
{ {
addonStore, addonStore,
@ -83,6 +85,7 @@ export default class AddonService {
this.logger = getLogger('services/addon-service.js'); this.logger = getLogger('services/addon-service.js');
this.tagTypeService = tagTypeService; this.tagTypeService = tagTypeService;
this.eventService = eventService; this.eventService = eventService;
this.eventHandlers = new Map();
this.addonProviders = this.addonProviders =
addons || addons ||
@ -124,42 +127,57 @@ export default class AddonService {
} }
registerEventHandler(): void { registerEventHandler(): void {
SUPPORTED_EVENTS.forEach((eventName) => SUPPORTED_EVENTS.forEach((eventName) => {
this.eventService.onEvent(eventName, this.handleEvent(eventName)), const handler = this.handleEvent(eventName);
); this.eventHandlers.set(eventName, handler);
this.eventService.onEvent(eventName, handler);
});
} }
handleEvent(eventName: string): (event: IEvent) => void { handleEvent(eventName: string): (event: IEvent) => void {
const { addonProviders } = this; const { addonProviders } = this;
return (event) => { return (event) => {
this.fetchAddonConfigs().then((addonInstances) => { this.fetchAddonConfigs()
addonInstances .then((addonInstances) => {
.filter((addon) => addon.events.includes(eventName)) addonInstances
.filter( .filter((addon) => addon.events.includes(eventName))
(addon) => .filter(
!event.project || (addon) =>
!addon.projects || !event.project ||
addon.projects.length === 0 || !addon.projects ||
addon.projects[0] === WILDCARD_OPTION || addon.projects.length === 0 ||
addon.projects.includes(event.project), addon.projects[0] === WILDCARD_OPTION ||
) addon.projects.includes(event.project),
.filter( )
(addon) => .filter(
!event.environment || (addon) =>
!addon.environments || !event.environment ||
addon.environments.length === 0 || !addon.environments ||
addon.environments[0] === WILDCARD_OPTION || addon.environments.length === 0 ||
addon.environments.includes(event.environment), addon.environments[0] === WILDCARD_OPTION ||
) addon.environments.includes(event.environment),
.filter((addon) => addonProviders[addon.provider]) )
.forEach((addon) => .filter((addon) => addonProviders[addon.provider])
addonProviders[addon.provider].handleEvent( .forEach((addon) =>
event, addonProviders[addon.provider].handleEvent(
addon.parameters, event,
addon.id, addon.parameters,
), addon.id,
); ),
}); );
})
.catch((error) => {
if (error.message === 'aborted') {
this.logger.debug(
`Addon event handling aborted during shutdown for event ${eventName}`,
);
} else {
this.logger.warn(
`Failed to handle addon event ${eventName}:`,
error,
);
}
});
}; };
} }
@ -349,6 +367,20 @@ export default class AddonService {
} }
destroy(): void { destroy(): void {
// Clean up event handlers first to prevent race conditions during teardown
this.eventHandlers.forEach((handler, eventName) => {
try {
this.eventService.off(eventName, handler);
} catch (error) {
this.logger.debug(
`Failed to remove event handler for ${eventName}:`,
error,
);
}
});
this.eventHandlers.clear();
// Then destroy addon providers
Object.values(this.addonProviders).forEach((addon) => Object.values(this.addonProviders).forEach((addon) =>
addon.destroy?.(), addon.destroy?.(),
); );