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.

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

Allow to use Promises on discard function #53

Merged
merged 5 commits into from
Oct 24, 2017
Merged
Show file tree
Hide file tree
Changes from 4 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
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ export type Config = {
detectNetwork: (callback: NetworkCallback) => void,
effect: (effect: any, action: OfflineAction) => Promise<*>,
retry: (action: OfflineAction, retries: number) => ?number,
discard: (error: any, action: OfflineAction, retries: number) => boolean,
discard: (error: any, action: OfflineAction, retries: number) => boolean|Promise<boolean>,
defaultCommit: { type: string },
defaultRollback: { type: string },
persist: (store: any) => any,
Expand Down Expand Up @@ -446,7 +446,14 @@ const config = {
}
```

The method receives the Error returned by the effect reconciler, the action being processed, and a number representing how many times the action has been retried. If the method returns `true`, the action will be discarded; `false`, and it will be retried. The full signature of the method is `(error: any, action: OfflineAction, retries: number) => boolean`.
The method receives the Error returned by the effect reconciler, the action
being processed, and a number representing how many times the action has been
retried. If the method returns `true`, the action will be discarded; `false`,
and it will be retried. The full signature of the method is `(error: any,
action: OfflineAction, retries: number) => boolean`. Alternatively, you can
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would update the signature and leave it at that.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you means?

return a Promise object that resolve to a boolean, allowing you to detect when
to discard asynchronously (for example, doing a request to a server to refresh a
token and try again).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your editor appears to have inserted line breaks here. It doesn't affect the resulting document, but I'd prefer to leave them out, just for consistency.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added them myself, I'm used to 80 columns also on Markdown files. I don't like to scroll horizontally and I would change the full file instead to adjust it, but if you preffer to have it the old way I can be able to change it.


#### Change how network requests are retried

Expand Down
28 changes: 28 additions & 0 deletions src/__tests__/send.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,34 @@ describe('when request fails', () => {
expect(dispatch).toBeCalledWith(expect.objectContaining(completedMeta));
});
});

test('dispatches complete action with promised discard', () => {
const effect = () => Promise.reject();
const discard = () => Promise.resolve(true);
const { action, config, dispatch } = setup({ effect, discard });
const promise = send(action, dispatch, config);

const { rollback } = action.meta.offline;
expect.assertions(2);
return promise.then(() => {
expect(dispatch).toBeCalledWith(expect.objectContaining(rollback));
expect(dispatch).toBeCalledWith(expect.objectContaining(completedMeta));
});
});

test('dispatches complete action when discard throw an exception', () => {
const effect = () => Promise.reject();
const discard = () => {throw new Error};
const { action, config, dispatch } = setup({ effect, discard });
const promise = send(action, dispatch, config);

const { rollback } = action.meta.offline;
expect.assertions(2);
return promise.then(() => {
expect(dispatch).toBeCalledWith(expect.objectContaining(rollback));
expect(dispatch).toBeCalledWith(expect.objectContaining(completedMeta));
});
});
});

describe('when request succeeds and commit is undefined', () => {
Expand Down
22 changes: 14 additions & 8 deletions src/send.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,28 @@ const send = (action: OfflineAction, dispatch, config: Config, retries = 0) => {
dispatch(complete({ type: JS_ERROR, payload: e }, false));
}
})
.catch(error => {
.catch(async error => {
const rollbackAction = metadata.rollback || {
...config.defaultRollback,
meta: { ...config.defaultRollback.meta, offlineAction: action }
};

// discard
if (config.discard(error, action, retries)) {
dispatch(complete(rollbackAction, false, error));
return;
let mustDiscard = true;
try {
mustDiscard = await config.discard(error, action, retries);
} catch (e) {
console.warn(e);
}
const delay = config.retry(action, retries);
if (delay != null) {
dispatch(scheduleRetry(delay));
return;

if (!mustDiscard) {
const delay = config.retry(action, retries);
if (delay != null) {
dispatch(scheduleRetry(delay));
return;
}
}

dispatch(complete(rollbackAction, false, error));
});
};
Expand Down