Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-17 12:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(Sharding): properly handle errors in fetchClientValues (#6990)

Browse Source
This commit is contained in:
SpaceEEC
2021-11-16 18:40:45 +01:00
committed by GitHub
parent fdb09cbe03
commit c0ba2d46d0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sharding/Shard.js
View File

@@ -247,7 +247,8 @@ class Shard extends EventEmitter {
if (message?._fetchProp !== prop) return; if (message?._fetchProp !== prop) return;
child.removeListener('message', listener); child.removeListener('message', listener);
this._fetches.delete(prop); this._fetches.delete(prop);
resolve(message._result); if (!message._error) resolve(message._result);
else reject(Util.makeError(message._error));
}; };
child.on('message', listener); child.on('message', listener);

12
src/sharding/ShardClientUtil.js
View File

@@ -175,10 +175,14 @@ class ShardClientUtil {
async _handleMessage(message) { async _handleMessage(message) {
if (!message) return; if (!message) return;
if (message._fetchProp) { if (message._fetchProp) {
const props = message._fetchProp.split('.'); try {
let value = this.client; const props = message._fetchProp.split('.');
for (const prop of props) value = value[prop]; let value = this.client;
this._respond('fetchProp', { _fetchProp: message._fetchProp, _result: value }); for (const prop of props) value = value[prop];
this._respond('fetchProp', { _fetchProp: message._fetchProp, _result: value });
} catch (err) {
this._respond('fetchProp', { _fetchProp: message._fetchProp, _error: Util.makePlainError(err) });
}
} else if (message._eval) { } else if (message._eval) {
try { try {
this._respond('eval', { _eval: message._eval, _result: await this.client._eval(message._eval) }); this._respond('eval', { _eval: message._eval, _result: await this.client._eval(message._eval) });