Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Remove chain cache that causes inconsistent execution issues #23

Merged
merged 1 commit into from
Nov 30, 2023
Merged

🐛 Remove chain cache that causes inconsistent execution issues #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions src/core/middlewares.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@
ReadonlyArray<Middleware>
> = new Map();

type CacheItem = {
key: {
messageType: string;
handler: MessageHandler;
};
value: MessageHandler;
};

const cache: Array<CacheItem> = [];

const createChain = <TMessage extends Message>(
messageType: Message['type'],
handler: MessageHandler<TMessage>,
Expand Down Expand Up @@ -92,49 +82,31 @@
const isAddMessageMiddlewaresOptions = <TMessage extends Message>(
value: AddOptions<TMessage>,
): value is AddMessageMiddlewaresOptions<TMessage> => {
return typeof (value as any).messageType === 'string';

Check warning on line 85 in src/core/middlewares.ts

View workflow job for this annotation

GitHub Actions / call-shared-workflow / lint 

Unexpected any. Specify a different type
};

const isAddHandlerMiddlewaresOptions = <TMessage extends Message>(
value: AddOptions<TMessage>,
): value is AddHandlerMiddlewaresOptions<TMessage> => {
return typeof (value as any).handler === 'function';

Check warning on line 91 in src/core/middlewares.ts

View workflow job for this annotation

GitHub Actions / call-shared-workflow / lint 

Unexpected any. Specify a different type
};

const add = <TMessage extends Message>(options: AddOptions<TMessage>) => {
if (isAddMessageMiddlewaresOptions(options)) {
const cacheItems = cache.filter(
(item) => item.key.messageType === options.messageType,
);
for (const cacheItem of cacheItems) {
cache.splice(cache.indexOf(cacheItem), 1);
}

const middlewares = messageMiddlewares.get(options.messageType) ?? [];

messageMiddlewares.set(options.messageType, [
...middlewares,
...(options.middlewares as ReadonlyArray<Middleware>),
]);
} else if (isAddHandlerMiddlewaresOptions(options)) {
const cacheItem = cache.find(
(item) => item.key.handler === options.handler,
);

if (cacheItem) {
cache.splice(cache.indexOf(cacheItem), 1);
}

const middlewares = handlerMiddlewares.get(options.handler) ?? [];

handlerMiddlewares.set(options.handler, [
...middlewares,
...(options.middlewares as ReadonlyArray<Middleware>),
]);
} else {
if (cache.length > 0) {
cache.splice(0, cache.length);
}
for (const middleware of options.middlewares) {
globalMiddlewares.add(middleware);
}
Expand All @@ -149,30 +121,15 @@
return handler;
}

const cacheItem = cache.find((item) => item.key.handler === handler);

if (cacheItem) {
return cacheItem.value;
}

const handlerWithMiddlewareChain = createChain(messageType, handler);

cache.push({
key: {
handler,
messageType,
},
value: handlerWithMiddlewareChain,
});

return handlerWithMiddlewareChain;
};

const clear = () => {
globalMiddlewares.clear();
messageMiddlewares.clear();
handlerMiddlewares.clear();
cache.splice(0, cache.length);
};

export const middlewares = {
Expand Down
Loading