Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,54 @@ describe('CronjobController', () => {
cronjobController.destroy();
});

it('handles scheduled event close to current time gracefully', () => {
const rootMessenger = getRootCronjobControllerMessenger();
const controllerMessenger =
getRestrictedCronjobControllerMessenger(rootMessenger);

const cronjobController = new CronjobController({
messenger: controllerMessenger,
state: {
events: {
foo: {
id: 'foo',
recurring: false,
date: '2022-01-01T00:00:01.000Z',
schedule: '2022-01-01T00:00:01.000Z',
scheduledAt: new Date().toISOString(),
snapId: MOCK_SNAP_ID,
request: {
method: 'handleEvent',
params: ['p1'],
},
},
},
},
});

rootMessenger.subscribe('CronjobController:stateChange', () => {
jest.advanceTimersByTime(inMilliseconds(2, Duration.Second));
});

cronjobController.init();

expect(rootMessenger.call).toHaveBeenNthCalledWith(
1,
'SnapController:handleRequest',
{
snapId: MOCK_SNAP_ID,
origin: METAMASK_ORIGIN,
handler: HandlerType.OnCronjob,
request: {
method: 'handleEvent',
params: ['p1'],
},
},
);

cronjobController.destroy();
});

it('handles the `snapInstalled` event', () => {
const rootMessenger = getRootCronjobControllerMessenger();
const controllerMessenger =
Expand Down
7 changes: 7 additions & 0 deletions packages/snaps-controllers/src/cronjob/CronjobController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,13 @@ export class CronjobController extends BaseController<
return;
}

// When an event is supposed to be scheduled close to the current time
// we may end up needing to execute immediately instead.
if (ms <= 0) {
this.#execute(event);
return;
}

const timer = new Timer(ms);
timer.start(() => {
this.#execute(event);
Expand Down
Loading