oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-10-14 06:51:58 +00:00
Code Wiki Activity

4.0.0-rc12.18

Browse source 
* Fixed: Force Apollo queries to reload if there is missing data in the cache. This should fix the loading errors.
* Fixed: Use `Tier 1`, `Tier 2`, `Tier 3`, etc. in the emote menu when the price is not available for a subscription product.
This commit is contained in:
SirStendec 2018-09-02 13:30:51 -04:00
parent 5cd0c11b0c
commit 3a0f94a230
8 changed files with 105 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

142
src/utilities/compat/apollo.js
View file

@ -77,6 +77,45 @@ export default class Apollo extends Module {
this.hooked_query_init = false;
const t = this,
proto = this.client.queryManager.constructor.prototype,
old_qm_get = proto.getCurrentQueryResult;
proto.getCurrentQueryResult = function(query, optimistic = true) {
const out = old_qm_get.call(this, query, optimistic);
if ( out && out.partial )
try {
try {
const prev = query.getLastResult(),
opts = query.options;
this.dataStore.getCache().read({
query: opts.query,
variables: opts.variables,
previousResult: prev ? prev.data : undefined,
optimistic
});
} catch(err) {
// If there's a missing field, and we have a lastResult, and lastResult is not loading, and lastResult is not error...
if ( err.toString().includes("Can't find field") && query.lastResult && ! query.lastResult.loading && ! query.lastError ) {
if ( Date.now() - (query._ffz_last_retry || 0) >= 120000 ) {
const raw_name = get('options.query.definitions.0.name', query),
name = raw_name && raw_name.kind === 'Name' ? raw_name.value : `#${query.queryId}`;
t.log.info('Forcing query to refetch due to missing field:', name);
query._ffz_last_retry = Date.now();
query.refetch();
}
}
}
} catch(err) {
t.log.capture(err);
}
return out;
}
if ( this.client.queryManager.queryStore ) {
const old_qm_init = this.client.queryManager.queryStore.initQuery;
this.hooked_query_init = true;
@ -118,86 +157,33 @@ export default class Apollo extends Module {
return forward(operation);
}
const out = forward(operation);
return forward(operation).map(result => {
if ( result.extensions && result.extensions.operationName === operation.operationName )
this.log.crumb({
level: 'info',
category: 'gql',
message: `${operation.operationName} [${result.extensions && result.extensions.durationMilliseconds || '??'}ms]`,
data: {
variables: vars,
}
});
if ( out.subscribe )
return new out.constructor(observer => {
try {
out.subscribe({
next: result => {
// Logging GQL errors is garbage. Don't do it.
/*if ( result.errors ) {
const name = operation.operationName;
if ( name && (name.includes('FFZ') || has(this.modifiers, name) || has(this.post_modifiers, name)) ) {
for(const err of result.errors) {
if ( skip_error(err) )
continue;
this.log.capture(new GQLError(err), {
tags: {
operation: operation.operationName
},
extra: {
variables: vars
}
});
}
}
}*/
this.log.crumb({
level: 'info',
category: 'gql',
message: `${operation.operationName} [${result.extensions && result.extensions.durationMilliseconds || '??'}ms]`,
data: {
variables: vars,
}
});
try {
this.apolloPostFlight(result);
} catch(err) {
this.log.capture(err, {
tags: {
operation: operation.operationName
},
extra: {
variables: vars
}
});
this.log.error('Error running Post-Flight', err, result);
}
observer.next(result);
},
error: err => {
observer.error(err);
},
complete: observer.complete.bind(observer)
});
} catch(err) {
this.log.capture(err, {
tags: {
operation: operation.operationName
},
extra: {
variables: vars
}
});
this.log.error('Link Error', err);
observer.error(err);
}
});
else {
// We didn't get the sort of output we expected.
this.log.info('Unexpected Link Result', out);
return out;
}
try {
this.apolloPostFlight(result);
} catch(err) {
this.log.capture(err, {
tags: {
operation: operation.operationName
},
extra: {
variables: vars
}
});
this.log.error('Error running Post-Flight', err, result);
}
return result;
});
})
this.old_link = this.client.link;