refactor: import timers, process, and Buffer from node: (#7157)

Co-authored-by: muchnameless <12682826+muchnameless@users.noreply.github.com> Co-authored-by: Almeida <almeidx@pm.me>
discordjs · Dec 28, 2021 · 3c62bd2 · 3c62bd2
1 parent d0c3961
commit 3c62bd2
Show file tree

Hide file tree

Showing 46 changed files with 79 additions and 5 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -171,6 +171,30 @@
     "prefer-template": "error",
     "rest-spread-spacing": "error",
     "template-curly-spacing": "error",
-    "yield-star-spacing": "error"
+    "yield-star-spacing": "error",
+
+    "no-restricted-globals": [
+      "error",
+      {
+        "name": "Buffer",
+        "message": "Import Buffer from `node:buffer` instead"
+      },
+      {
+        "name": "process",
+        "message": "Import process from `node:process` instead"
+      },
+      {
+        "name": "setTimeout",
+        "message": "Import setTimeout from `node:timers` instead"
+      },
+      {
+        "name": "setInterval",
+        "message": "Import setInterval from `node:timers` instead"
+      },
+      {
+        "name": "setImmediate",
+        "message": "Import setImmediate from `node:timers` instead"
+      }
+    ]
   }
 }
diff --git a/src/WebSocket.js b/src/WebSocket.js
@@ -1,6 +1,7 @@
 'use strict';
 
 let erlpack;
+const { Buffer } = require('node:buffer');
 
 try {
   erlpack = require('erlpack');

diff --git a/src/client/Client.js b/src/client/Client.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const process = require('node:process');
+const { setInterval } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const BaseClient = require('./BaseClient');
 const ActionsManager = require('./actions/ActionsManager');

diff --git a/src/client/actions/GuildDelete.js b/src/client/actions/GuildDelete.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { setTimeout } = require('node:timers');
 const Action = require('./Action');
 const { deletedGuilds } = require('../../structures/Guild');
 const { Events } = require('../../util/Constants');

diff --git a/src/client/actions/InteractionCreate.js b/src/client/actions/InteractionCreate.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Action = require('./Action');
 const AutocompleteInteraction = require('../../structures/AutocompleteInteraction');
 const ButtonInteraction = require('../../structures/ButtonInteraction');

diff --git a/src/client/actions/MessageCreate.js b/src/client/actions/MessageCreate.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Action = require('./Action');
 const { Events } = require('../../util/Constants');
 

diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const EventEmitter = require('node:events');
+const { setImmediate } = require('node:timers');
 const { setTimeout: sleep } = require('node:timers/promises');
 const { Collection } = require('@discordjs/collection');
 const { RPCErrorCodes } = require('discord-api-types/v9');

diff --git a/src/client/websocket/WebSocketShard.js b/src/client/websocket/WebSocketShard.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const EventEmitter = require('node:events');
+const { setTimeout, setInterval } = require('node:timers');
 const WebSocket = require('../../WebSocket');
 const { Status, Events, ShardEvents, Opcodes, WSEvents } = require('../../util/Constants');
 const Intents = require('../../util/Intents');

diff --git a/src/managers/ChannelManager.js b/src/managers/ChannelManager.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const CachedManager = require('./CachedManager');
 const { Channel } = require('../structures/Channel');
 const { Events, ThreadChannelTypes } = require('../util/Constants');

diff --git a/src/managers/GuildChannelManager.js b/src/managers/GuildChannelManager.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const ThreadManager = require('./ThreadManager');

diff --git a/src/managers/GuildManager.js b/src/managers/GuildManager.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const process = require('node:process');
+const { setTimeout } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Guild } = require('../structures/Guild');

diff --git a/src/managers/GuildMemberManager.js b/src/managers/GuildMemberManager.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
+const { setTimeout } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error, TypeError, RangeError } = require('../errors');

diff --git a/src/managers/PermissionOverwriteManager.js b/src/managers/PermissionOverwriteManager.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');

diff --git a/src/managers/RoleManager.js b/src/managers/RoleManager.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');

diff --git a/src/rest/APIRequest.js b/src/rest/APIRequest.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const https = require('node:https');
+const { setTimeout } = require('node:timers');
 const FormData = require('form-data');
 const fetch = require('node-fetch');
 const { UserAgent } = require('../util/Constants');

diff --git a/src/rest/RESTManager.js b/src/rest/RESTManager.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { setInterval } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const APIRequest = require('./APIRequest');
 const routeBuilder = require('./APIRouter');

diff --git a/src/rest/RequestHandler.js b/src/rest/RequestHandler.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { setTimeout } = require('node:timers');
 const { setTimeout: sleep } = require('node:timers/promises');
 const { AsyncQueue } = require('@sapphire/async-queue');
 const DiscordAPIError = require('./DiscordAPIError');

diff --git a/src/sharding/Shard.js b/src/sharding/Shard.js
@@ -2,6 +2,8 @@
 
 const EventEmitter = require('node:events');
 const path = require('node:path');
+const process = require('node:process');
+const { setTimeout } = require('node:timers');
 const { setTimeout: sleep } = require('node:timers/promises');
 const { Error } = require('../errors');
 const Util = require('../util/Util');

diff --git a/src/sharding/ShardClientUtil.js b/src/sharding/ShardClientUtil.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { Error } = require('../errors');
 const { Events } = require('../util/Constants');
 const Util = require('../util/Util');

diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js
@@ -3,6 +3,7 @@
 const EventEmitter = require('node:events');
 const fs = require('node:fs');
 const path = require('node:path');
+const process = require('node:process');
 const { setTimeout: sleep } = require('node:timers/promises');
 const { Collection } = require('@discordjs/collection');
 const Shard = require('./Shard');

diff --git a/src/structures/Channel.js b/src/structures/Channel.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Base = require('./Base');
 let CategoryChannel;
 let DMChannel;

diff --git a/src/structures/Emoji.js b/src/structures/Emoji.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Base = require('./Base');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 

diff --git a/src/structures/Guild.js b/src/structures/Guild.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const AnonymousGuild = require('./AnonymousGuild');
 const GuildAuditLogs = require('./GuildAuditLogs');

diff --git a/src/structures/GuildMember.js b/src/structures/GuildMember.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Base = require('./Base');
 const VoiceState = require('./VoiceState');
 const TextBasedChannel = require('./interfaces/TextBasedChannel');

diff --git a/src/structures/GuildTemplate.js b/src/structures/GuildTemplate.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { setTimeout } = require('node:timers');
 const Base = require('./Base');
 const { Events } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');

diff --git a/src/structures/Message.js b/src/structures/Message.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const BaseMessageComponent = require('./BaseMessageComponent');

diff --git a/src/structures/MessageEmbed.js b/src/structures/MessageEmbed.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { RangeError } = require('../errors');
 const Util = require('../util/Util');
 

diff --git a/src/structures/MessagePayload.js b/src/structures/MessagePayload.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
 const BaseMessageComponent = require('./BaseMessageComponent');
 const MessageEmbed = require('./MessageEmbed');
 const { RangeError } = require('../errors');

diff --git a/src/structures/Role.js b/src/structures/Role.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Base = require('./Base');
 const { Error } = require('../errors');
 const Permissions = require('../util/Permissions');

diff --git a/src/structures/StageInstance.js b/src/structures/StageInstance.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Base = require('./Base');
 const { PrivacyLevels } = require('../util/Constants');
 const SnowflakeUtil = require('../util/SnowflakeUtil');

diff --git a/src/structures/Sticker.js b/src/structures/Sticker.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Base = require('./Base');
 const { StickerFormatTypes, StickerTypes } = require('../util/Constants');
 const SnowflakeUtil = require('../util/SnowflakeUtil');

diff --git a/src/structures/VoiceChannel.js b/src/structures/VoiceChannel.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const BaseGuildVoiceChannel = require('./BaseGuildVoiceChannel');
 const Permissions = require('../util/Permissions');
 

diff --git a/src/structures/Webhook.js b/src/structures/Webhook.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const MessagePayload = require('./MessagePayload');
 const { Error } = require('../errors');
 const { WebhookTypes } = require('../util/Constants');

diff --git a/src/structures/interfaces/Collector.js b/src/structures/interfaces/Collector.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const EventEmitter = require('node:events');
+const { setTimeout } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const { TypeError } = require('../../errors');
 const Util = require('../../util/Util');

diff --git a/src/util/Constants.js b/src/util/Constants.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const Package = (exports.Package = require('../../package.json'));
 const { Error, RangeError, TypeError } = require('../errors');
 

diff --git a/src/util/DataResolver.js b/src/util/DataResolver.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
 const fs = require('node:fs');
 const path = require('node:path');
 const stream = require('node:stream');

diff --git a/src/util/LimitedCollection.js b/src/util/LimitedCollection.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { setInterval } = require('node:timers');
 const { Collection } = require('@discordjs/collection');
 const { _cleanupSymbol } = require('./Constants.js');
 const Sweepers = require('./Sweepers.js');

diff --git a/src/util/Options.js b/src/util/Options.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const process = require('node:process');
+
 /**
  * Rate limit data
  * @typedef {Object} RateLimitData

diff --git a/src/util/Sweepers.js b/src/util/Sweepers.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { setInterval } = require('node:timers');
 const { Events, ThreadChannelTypes, SweeperKeys } = require('./Constants');
 const { TypeError } = require('../errors/DJSError.js');
 

diff --git a/src/util/Util.js b/src/util/Util.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const { parse } = require('node:path');
+const process = require('node:process');
 const { Collection } = require('@discordjs/collection');
 const fetch = require('node-fetch');
 const { Colors, Endpoints } = require('./Constants');

diff --git a/test/sendtest.js b/test/sendtest.js
@@ -2,6 +2,8 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
+const process = require('node:process');
+const { setTimeout: sleep } = require('node:timers/promises');
 const util = require('node:util');
 const fetch = require('node-fetch');
 const { owner, token } = require('./auth.js');
@@ -12,7 +14,6 @@ const client = new Client({ intents: [Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_
 const buffer = l => fetch(l).then(res => res.buffer());
 const read = util.promisify(fs.readFile);
 const readStream = fs.createReadStream;
-const wait = util.promisify(setTimeout);
 
 const linkA = 'https://lolisafe.moe/iiDMtAXA.png';
 const linkB = 'https://lolisafe.moe/9hSpedPh.png';
@@ -97,7 +98,7 @@ client.on('messageCreate', async message => {
     for (const [i, test] of tests.entries()) {
       await message.channel.send(`**#${i}**\n\`\`\`js\n${test.toString()}\`\`\``);
       await test(message).catch(e => message.channel.send(`Error!\n\`\`\`\n${e}\`\`\``));
-      await wait(1_000);
+      await sleep(1_000);
     }
     /* eslint-enable no-await-in-loop */
   } else if (match) {

diff --git a/test/shard.js b/test/shard.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const process = require('node:process');
+const { setTimeout } = require('node:timers');
 const { token } = require('./auth.json');
 const { Client, Intents } = require('../src');
 

diff --git a/test/sharder.js b/test/sharder.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { token } = require('./auth');
 const Discord = require('../src');
 

diff --git a/test/tester1000.js b/test/tester1000.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { token, prefix, owner } = require('./auth.js');
 const { Client, Intents } = require('../src');
 

diff --git a/test/tester2000.js b/test/tester2000.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const { token, prefix, owner } = require('./auth.js');
 const { Client, Options, Intents, Formatters } = require('../src');
 

diff --git a/test/webhooktest.js b/test/webhooktest.js
@@ -2,6 +2,7 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
+const { setTimeout: sleep } = require('node:timers/promises');
 const util = require('node:util');
 const fetch = require('node-fetch');
 const { owner, token, webhookChannel, webhookToken } = require('./auth.js');
@@ -12,7 +13,6 @@ const client = new Client({ intents: [Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_
 const buffer = l => fetch(l).then(res => res.buffer());
 const read = util.promisify(fs.readFile);
 const readStream = fs.createReadStream;
-const wait = util.promisify(setTimeout);
 
 const linkA = 'https://lolisafe.moe/iiDMtAXA.png';
 const linkB = 'https://lolisafe.moe/9hSpedPh.png';
@@ -107,7 +107,7 @@ client.on('messageCreate', async message => {
       for (const [i, test] of tests.entries()) {
         await message.channel.send(`**#${i}-Hook: ${type}**\n\`\`\`js\n${test.toString()}\`\`\``);
         await test(message, hook).catch(e => message.channel.send(`Error!\n\`\`\`\n${e}\`\`\``));
-        await wait(1_000);
+        await sleep(1_000);
       }
     }
     /* eslint-enable no-await-in-loop */