mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-17 15:33:12 +09:00
Share one connect and close listener between subscribers (#1171)
* Share one connect and close listener between subscribers Every EventSubscriber added its own connect and close listener to the connector, and Link caps the connector at 20 listeners per event. The web Control and App use 13 close listeners, so the 8th plugin subscriber made the browser log MaxListenersExceededWarning on every page load. Subscribers on a connector now share one listener for each event, which leaves the cap in place for everything else. * Keep the connector subscribers as a static on EventSubscriber
This commit is contained in:
2 files changed
+75
-7
No files matched your search
@@ -1021,6 +1021,47 @@ describe("lib/subscriptions", function() {
|
||||
it("should handle the provided event", function() {
|
||||
assert.equal(mockControl._eventHandlers.has(RegisteredEvent), true);
|
||||
});
|
||||
|
||||
it("should share one connect and close listener on the connector", function() {
|
||||
const connector = mockControl.connector;
|
||||
const connectListeners = connector.listenerCount("connect");
|
||||
const closeListeners = connector.listenerCount("close");
|
||||
const subscribers = [
|
||||
new lib.EventSubscriber(StringPermissionEvent, mockControl),
|
||||
new lib.EventSubscriber(FunctionPermissionEvent, mockControl),
|
||||
];
|
||||
assert.equal(subscribers.length, 2);
|
||||
assert.equal(connector.listenerCount("connect"), connectListeners);
|
||||
assert.equal(connector.listenerCount("close"), closeListeners);
|
||||
});
|
||||
|
||||
it("should pass connect and close to every subscriber on the connector", function() {
|
||||
const subscribers = [
|
||||
eventSubscriber,
|
||||
new lib.EventSubscriber(StringPermissionEvent, mockControl),
|
||||
new lib.EventSubscriber(FunctionPermissionEvent, mockControl),
|
||||
];
|
||||
const received = subscribers.map(() => []);
|
||||
subscribers.forEach((subscriber, index) => {
|
||||
subscriber.handleConnectionEvent = event => { received[index].push(event); };
|
||||
});
|
||||
mockControl.connector.emit("close");
|
||||
mockControl.connector.emit("connect");
|
||||
assert.deepEqual(received, [["close", "connect"], ["close", "connect"], ["close", "connect"]]);
|
||||
});
|
||||
|
||||
it("should only pass events to subscribers on the same connector", function() {
|
||||
const otherControl = new MockControl(new MockConnector(
|
||||
addr({ controlId: 1 }),
|
||||
addr("controller"),
|
||||
));
|
||||
const other = new lib.EventSubscriber(RegisteredEvent, otherControl);
|
||||
const received = [];
|
||||
eventSubscriber.handleConnectionEvent = event => { received.push(["first", event]); };
|
||||
other.handleConnectionEvent = event => { received.push(["other", event]); };
|
||||
otherControl.connector.emit("close");
|
||||
assert.deepEqual(received, [["other", "close"]]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("subscribe()", function() {
|
||||
|
||||
Reference in new issue
Block a user