Skip to content

fix(Web): separate-batchers #1867

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

Merged
merged 3 commits into from
Jan 30, 2025
Merged

fix(Web): separate-batchers #1867

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f12c3f
fix(Web): separate-batchers
tractorss Jan 29, 2025
9616df8
refactor(web): abstract-fetch-logic
tractorss Jan 29, 2025
07137fd
Merge branch 'dev' into fix/separate-batchers
tractorss Jan 30, 2025
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
35 changes: 30 additions & 5 deletions web/src/context/GraphqlBatcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ interface IQuery {

const Context = createContext<IGraphqlBatcher | undefined>(undefined);

const executor: AsyncExecutor = async ({ document, variables, extensions }) => {
const coreExecutor: AsyncExecutor = async ({ document, variables }) => {
try {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
const result = request(extensions.url, document, variables).then((res) => ({
const result = request(getGraphqlUrl(false), document, variables).then((res) => ({
data: res,
})) as Promise<ExecutionResult>;

Expand All @@ -38,12 +38,37 @@ const executor: AsyncExecutor = async ({ document, variables, extensions }) => {
}
};

const batchExec = createBatchingExecutor(executor);
const dtrExecutor: AsyncExecutor = async ({ document, variables }) => {
try {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
const result = request(getGraphqlUrl(true), document, variables).then((res) => ({
data: res,
})) as Promise<ExecutionResult>;

return result;
} catch (error) {
console.error("Graph error: ", { error });
debounceErrorToast("Graph query error: failed to fetch data.");
return { data: {} };
}
};

const coreBatchExec = createBatchingExecutor(coreExecutor);
const dtrBatchExec = createBatchingExecutor(dtrExecutor);

const fetcher = async (queries: IQuery[]) => {
const batchdata = await Promise.all(
queries.map(({ document, variables, isDisputeTemplate, chainId }) =>
batchExec({ document, variables, extensions: { url: getGraphqlUrl(isDisputeTemplate ?? false, chainId) } })
queries.map(({ document, variables, isDisputeTemplate }) =>
isDisputeTemplate
? dtrBatchExec({
document,
variables,
})
: coreBatchExec({
document,
variables,
})
)
);

Expand Down