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

refactor: new node features (#5132)

Browse Source 
Co-authored-by: Antonio Román <kyradiscord@gmail.com>
This commit is contained in:
Sugden
2021-06-30 21:40:33 +01:00
committed by GitHub
parent f108746c15
commit 1e8f01253e
68 changed files with 305 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sharding/Shard.js
View File

@@ -40,7 +40,7 @@ class Shard extends EventEmitter {
* Arguments for the shard's process (only when {@link ShardingManager#mode} is `process`)
* @type {string[]}
*/
this.args = manager.shardArgs || [];
this.args = manager.shardArgs ?? [];
/**
* Arguments for the shard's process executable (only when {@link ShardingManager#mode} is `process`)
@@ -127,14 +127,16 @@ class Shard extends EventEmitter {
this._evals.clear();
this._fetches.clear();
const child = this.process ?? this.worker;
/**
* Emitted upon the creation of the shard's child process/worker.
* @event Shard#spawn
* @param {ChildProcess|Worker} process Child process/worker that was created
*/
this.emit('spawn', this.process || this.worker);
this.emit('spawn', child);
if (timeout === -1 || timeout === Infinity) return this.process || this.worker;
if (timeout === -1 || timeout === Infinity) return child;
await new Promise((resolve, reject) => {
const cleanup = () => {
clearTimeout(spawnTimeoutTimer);
@@ -168,7 +170,7 @@ class Shard extends EventEmitter {
this.once('disconnect', onDisconnect);
this.once('death', onDeath);
});
return this.process || this.worker;
return child;
}
/**
@@ -242,10 +244,10 @@ class Shard extends EventEmitter {
if (this._fetches.has(prop)) return this._fetches.get(prop);
const promise = new Promise((resolve, reject) => {
const child = this.process || this.worker;
const child = this.process ?? this.worker;
const listener = message => {
if (!message || message._fetchProp !== prop) return;
if (message?._fetchProp !== prop) return;
child.removeListener('message', listener);
this._fetches.delete(prop);
resolve(message._result);
@@ -276,10 +278,10 @@ class Shard extends EventEmitter {
if (this._evals.has(script)) return this._evals.get(script);
const promise = new Promise((resolve, reject) => {
const child = this.process || this.worker;
const child = this.process ?? this.worker;
const listener = message => {
if (!message || message._eval !== script) return;
if (message?._eval !== script) return;
child.removeListener('message', listener);
this._evals.delete(script);
if (!message._error) resolve(message._result);
@@ -388,7 +390,7 @@ class Shard extends EventEmitter {
* @event Shard#death
* @param {ChildProcess|Worker} process Child process/worker that exited
*/
this.emit('death', this.process || this.worker);
this.emit('death', this.process ?? this.worker);
this.ready = false;
this.process = null;