Skip to content

Commit

Permalink
fix: Fix StaticIntervalPollingController not properly stopping poll…
Browse files Browse the repository at this point in the history 
…ing if `_executePoll` was still pending (#4230)

## Explanation

<!--
Thanks for your contribution! Take a moment to answer these questions so
that reviewers have the information they need to properly understand
your changes:

* What is the current state of things and why does it need to change?
* What is the solution your changes offer and how does it work?
* Are there any changes whose purpose might not obvious to those
unfamiliar with the domain?
* If your primary goal was to update one package but you found you had
to update another one along the way, why did you do so?
* If you had to upgrade a dependency, why did you do so?
-->

Currently, there is a bug in the StaticIntervalPollingController that
causes polling to not be properly stopped if a stop is requested while
`_executePoll` has not yet resolved for the current loop. This PR adds a
guard to check if the id returned by setTimeout still matches what is in
state, indicating that polling is still active.

## References

<!--
Are there any issues that this pull request is tied to? Are there other
links that reviewers should consult to understand these changes better?

For example:

* Fixes #12345
* Related to #67890
-->

## Changelog

<!--
If you're making any consumer-facing changes, list those changes here as
if you were updating a changelog, using the template below as a guide.

(CATEGORY is one of BREAKING, ADDED, CHANGED, DEPRECATED, REMOVED, or
FIXED. For security-related issues, follow the Security Advisory
process.)

Please take care to name the exact pieces of the API you've added or
changed (e.g. types, interfaces, functions, or methods).

If there are any breaking changes, make sure to offer a solution for
consumers to follow once they upgrade to the changes.

Finally, if you're only making changes to development scripts or tests,
you may replace the template below with "None".
-->

### `@metamask/polling-controller`

- **FIXED**: `StaticIntervalPollingControllerOnly`,
`StaticIntervalPollingController`, and
`StaticIntervalPollingControllerV1` now properly stops polling when a
stop is requested while `_executePoll` has not yet resolved for the
current loop

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [ ] I've highlighted breaking changes using the "BREAKING" category
above as appropriate

---------

Co-authored-by: Alex Donesky <[email protected]>
  • Loading branch information
@jiexi @adonesky1
jiexi and adonesky1 authored May 7, 2024
1 parent 68b8de7 commit cd189f1
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 13 deletions.
72 changes: 62 additions & 10 deletions packages/polling-controller/src/StaticIntervalPollingController.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
import { ControllerMessenger } from '@metamask/base-controller';
import { createDeferredPromise } from '@metamask/utils';
import { useFakeTimers } from 'sinon';

import { advanceTime } from '../../../tests/helpers';
import { StaticIntervalPollingController } from './StaticIntervalPollingController';

const TICK_TIME = 5;

const createExecutePollMock = () => {
const executePollMock = jest.fn().mockImplementation(async () => {
return true;
});
return executePollMock;
};

class ChildBlockTrackerPollingController extends StaticIntervalPollingController<
// TODO: Replace `any` with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand All @@ -24,7 +18,18 @@ class ChildBlockTrackerPollingController extends StaticIntervalPollingController
// eslint-disable-next-line @typescript-eslint/no-explicit-any
any
> {
_executePoll = createExecutePollMock();
executePollPromises: {
reject: (err: unknown) => void;
resolve: () => void;
}[] = [];

_executePoll = jest.fn().mockImplementation(() => {
const { promise, reject, resolve } = createDeferredPromise({
suppressUnhandledRejection: true,
});
this.executePollPromises.push({ reject, resolve });
return promise;
});
}

describe('StaticIntervalPollingController', () => {
Expand All @@ -48,6 +53,7 @@ describe('StaticIntervalPollingController', () => {
controller.setIntervalLength(TICK_TIME);
clock = useFakeTimers();
});

afterEach(() => {
clock.restore();
});
Expand All @@ -57,6 +63,7 @@ describe('StaticIntervalPollingController', () => {
controller.startPollingByNetworkClientId('mainnet');
await advanceTime({ clock, duration: 0 });
expect(controller._executePoll).toHaveBeenCalledTimes(1);
controller.executePollPromises[0].resolve();
await advanceTime({ clock, duration: TICK_TIME });
expect(controller._executePoll).toHaveBeenCalledTimes(2);
controller.stopAllPolling();
Expand All @@ -70,11 +77,16 @@ describe('StaticIntervalPollingController', () => {
await advanceTime({ clock, duration: 0 });

expect(controller._executePoll).toHaveBeenCalledTimes(1);
await advanceTime({ clock, duration: TICK_TIME * 2 });
controller.executePollPromises[0].resolve();
await advanceTime({ clock, duration: TICK_TIME });
controller.executePollPromises[1].resolve();
await advanceTime({ clock, duration: TICK_TIME });
controller.executePollPromises[2].resolve();

expect(controller._executePoll).toHaveBeenCalledTimes(3);
controller.stopAllPolling();
});

describe('multiple networkClientIds', () => {
it('should poll for each networkClientId', async () => {
controller.startPollingByNetworkClientId('mainnet');
Expand All @@ -87,6 +99,9 @@ describe('StaticIntervalPollingController', () => {
['mainnet', {}],
['rinkeby', {}],
]);

controller.executePollPromises[0].resolve();
controller.executePollPromises[1].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -95,6 +110,9 @@ describe('StaticIntervalPollingController', () => {
['mainnet', {}],
['rinkeby', {}],
]);

controller.executePollPromises[2].resolve();
controller.executePollPromises[3].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -116,6 +134,7 @@ describe('StaticIntervalPollingController', () => {
expect(controller._executePoll.mock.calls).toMatchObject([
['mainnet', {}],
]);
controller.executePollPromises[0].resolve();
await advanceTime({ clock, duration: TICK_TIME });

controller.startPollingByNetworkClientId('sepolia');
Expand All @@ -125,13 +144,17 @@ describe('StaticIntervalPollingController', () => {
['mainnet', {}],
['sepolia', {}],
]);

controller.executePollPromises[1].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
['mainnet', {}],
['sepolia', {}],
['mainnet', {}],
]);

controller.executePollPromises[2].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -140,6 +163,8 @@ describe('StaticIntervalPollingController', () => {
['mainnet', {}],
['sepolia', {}],
]);

controller.executePollPromises[3].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -149,6 +174,8 @@ describe('StaticIntervalPollingController', () => {
['sepolia', {}],
['mainnet', {}],
]);

controller.executePollPromises[4].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -168,24 +195,29 @@ describe('StaticIntervalPollingController', () => {
const pollingToken = controller.startPollingByNetworkClientId('mainnet');
await advanceTime({ clock, duration: 0 });
expect(controller._executePoll).toHaveBeenCalledTimes(1);
controller.executePollPromises[0].resolve();
await advanceTime({ clock, duration: TICK_TIME });
controller.stopPollingByPollingToken(pollingToken);
await advanceTime({ clock, duration: TICK_TIME });
expect(controller._executePoll).toHaveBeenCalledTimes(2);
controller.stopAllPolling();
});

it('should not stop polling if called with one of multiple active polling tokens for a given networkClient', async () => {
const pollingToken1 = controller.startPollingByNetworkClientId('mainnet');
await advanceTime({ clock, duration: 0 });

controller.startPollingByNetworkClientId('mainnet');
expect(controller._executePoll).toHaveBeenCalledTimes(1);
controller.executePollPromises[0].resolve();
await advanceTime({ clock, duration: TICK_TIME });
controller.stopPollingByPollingToken(pollingToken1);
controller.executePollPromises[1].resolve();
await advanceTime({ clock, duration: TICK_TIME });
expect(controller._executePoll).toHaveBeenCalledTimes(3);
controller.stopAllPolling();
});

it('should error if no pollingToken is passed', () => {
controller.startPollingByNetworkClientId('mainnet');
expect(() => {
Expand All @@ -195,10 +227,10 @@ describe('StaticIntervalPollingController', () => {
});

it('should start and stop polling sessions for different networkClientIds with the same options', async () => {
controller.setIntervalLength(TICK_TIME);
const pollToken1 = controller.startPollingByNetworkClientId('mainnet', {
address: '0x1',
});
await advanceTime({ clock, duration: 0 });
controller.startPollingByNetworkClientId('mainnet', { address: '0x2' });
await advanceTime({ clock, duration: 0 });

Expand All @@ -210,6 +242,10 @@ describe('StaticIntervalPollingController', () => {
['mainnet', { address: '0x2' }],
['sepolia', { address: '0x2' }],
]);

controller.executePollPromises[0].resolve();
controller.executePollPromises[1].resolve();
controller.executePollPromises[2].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -221,6 +257,9 @@ describe('StaticIntervalPollingController', () => {
['sepolia', { address: '0x2' }],
]);
controller.stopPollingByPollingToken(pollToken1);
controller.executePollPromises[3].resolve();
controller.executePollPromises[4].resolve();
controller.executePollPromises[5].resolve();
await advanceTime({ clock, duration: TICK_TIME });

expect(controller._executePoll.mock.calls).toMatchObject([
Expand All @@ -234,6 +273,19 @@ describe('StaticIntervalPollingController', () => {
['sepolia', { address: '0x2' }],
]);
});

it('should stop polling session after current iteration if stop is requested while current iteration is still executing', async () => {
const pollingToken = controller.startPollingByNetworkClientId('mainnet');
await advanceTime({ clock, duration: 0 });
expect(controller._executePoll).toHaveBeenCalledTimes(1);
controller.stopPollingByPollingToken(pollingToken);
controller.executePollPromises[0].resolve();
await advanceTime({ clock, duration: TICK_TIME });
expect(controller._executePoll).toHaveBeenCalledTimes(1);
await advanceTime({ clock, duration: TICK_TIME });
expect(controller._executePoll).toHaveBeenCalledTimes(1);
controller.stopAllPolling();
});
});

describe('onPollingCompleteByNetworkClientId', () => {
Expand Down
9 changes: 6 additions & 3 deletions packages/polling-controller/src/StaticIntervalPollingController.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,20 @@ function StaticIntervalPollingControllerMixin<TBase extends Constructor>(
const existingInterval = this.#intervalIds[key];
this._stopPollingByPollingTokenSetId(key);

this.#intervalIds[key] = setTimeout(
// eslint-disable-next-line no-multi-assign
const intervalId = (this.#intervalIds[key] = setTimeout(
async () => {
try {
await this._executePoll(networkClientId, options);
} catch (error) {
console.error(error);
}
this._startPollingByNetworkClientId(networkClientId, options);
if (intervalId === this.#intervalIds[key]) {
this._startPollingByNetworkClientId(networkClientId, options);
}
},
existingInterval ? this.#intervalLength : 0,
);
));
}

_stopPollingByPollingTokenSetId(key: PollingTokenSetId) {
Expand Down

0 comments on commit cd189f1

Please sign in to comment.