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

Add client shard eval/client property fetching, and improve existing shard stuff

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-09-27 02:19:53 -04:00
parent c26fc49caf
commit e5a987e0ef
7 changed files with 177 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/sharding/Shard.js
View File

@@ -1,5 +1,6 @@
const childProcess = require('child_process');
const path = require('path');
const makeError = require('../util/MakeError');
/**
* Represents a Shard spawned by the ShardingManager.
@@ -32,11 +33,7 @@ class Shard {
SHARD_COUNT: this.manager.totalShards,
},
});
this.process.on('message', message => {
this.manager.emit('message', this, message);
});
this.process.on('message', message => { this.manager.emit('message', this, message); });
this.process.once('exit', () => {
if (this.manager.respawn) this.manager.createShard(this.id);
});
@@ -69,20 +66,10 @@ class Shard {
const promise = new Promise((resolve, reject) => {
const listener = message => {
if (!message) return;
if (message._evalResult) {
this.process.removeListener('message', listener);
this._evals.delete(script);
resolve(message._evalResult);
} else if (message._evalError) {
this.process.removeListener('message', listener);
const err = new Error(message._evalError.message, message._evalError.fileName, message._evalError.lineNumber);
err.name = message._evalError.name;
err.columnNumber = message._evalError.columnNumber;
err.stack = message._evalError.stack;
this._evals.delete(script);
reject(err);
}
if (!message || message._eval !== script) return;
this.process.removeListener('message', listener);
this._evals.delete(script);
if (!message._error) resolve(message._result); else reject(makeError(message._error));
};
this.process.on('message', listener);
@@ -111,10 +98,10 @@ class Shard {
const promise = new Promise((resolve, reject) => {
const listener = message => {
if (typeof message !== 'object' || message._fetchProp !== prop) return;
if (!message || message._fetchProp !== prop) return;
this.process.removeListener('message', listener);
this._fetches.delete(prop);
resolve(message._fetchPropValue);
resolve(message._result);
};
this.process.on('message', listener);