From 531b46c60d022f0814c6528abc922d40e4ad3476 Mon Sep 17 00:00:00 2001 From: Almeida Date: Sat, 2 Oct 2021 12:40:02 +0100 Subject: [PATCH] refactor: use the `node:` protocol (#6710) --- src/client/BaseClient.js | 2 +- src/client/Client.js | 2 +- src/client/actions/ActionsManager.js | 2 +- src/client/websocket/WebSocketManager.js | 2 +- src/client/websocket/WebSocketShard.js | 2 +- src/rest/APIRequest.js | 2 +- src/sharding/Shard.js | 8 ++++---- src/sharding/ShardClientUtil.js | 2 +- src/sharding/ShardingManager.js | 6 +++--- src/structures/interfaces/Collector.js | 2 +- src/util/DataResolver.js | 6 +++--- src/util/Util.js | 2 +- test/createGuild.js | 2 +- test/sendtest.js | 6 +++--- test/tester1000.js | 2 +- test/tester2000.js | 2 +- test/webhooktest.js | 6 +++--- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/client/BaseClient.js b/src/client/BaseClient.js index a220caaba..e0ee6a413 100644 --- a/src/client/BaseClient.js +++ b/src/client/BaseClient.js @@ -1,6 +1,6 @@ 'use strict'; -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); const RESTManager = require('../rest/RESTManager'); const Options = require('../util/Options'); const Util = require('../util/Util'); diff --git a/src/client/Client.js b/src/client/Client.js index 3d8856fbd..c0e980ac8 100644 --- a/src/client/Client.js +++ b/src/client/Client.js @@ -37,7 +37,7 @@ class Client extends BaseClient { constructor(options) { super(options); - const data = require('worker_threads').workerData ?? process.env; + const data = require('node:worker_threads').workerData ?? process.env; const defaults = Options.createDefault(); if (this.options.shards === defaults.shards) { diff --git a/src/client/actions/ActionsManager.js b/src/client/actions/ActionsManager.js index a40b5be0a..cbefce202 100644 --- a/src/client/actions/ActionsManager.js +++ b/src/client/actions/ActionsManager.js @@ -1,6 +1,6 @@ 'use strict'; -const fs = require('fs'); +const fs = require('node:fs'); class ActionsManager { constructor(client) { diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js index 49acd8d62..beae2fcdf 100644 --- a/src/client/websocket/WebSocketManager.js +++ b/src/client/websocket/WebSocketManager.js @@ -1,6 +1,6 @@ 'use strict'; -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); const { Collection } = require('@discordjs/collection'); const { RPCErrorCodes } = require('discord-api-types/v9'); const WebSocketShard = require('./WebSocketShard'); diff --git a/src/client/websocket/WebSocketShard.js b/src/client/websocket/WebSocketShard.js index 3ab8d0216..c427a4253 100644 --- a/src/client/websocket/WebSocketShard.js +++ b/src/client/websocket/WebSocketShard.js @@ -1,6 +1,6 @@ 'use strict'; -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); const WebSocket = require('../../WebSocket'); const { Status, Events, ShardEvents, Opcodes, WSEvents } = require('../../util/Constants'); const Intents = require('../../util/Intents'); diff --git a/src/rest/APIRequest.js b/src/rest/APIRequest.js index 6c7205f03..6397b204f 100644 --- a/src/rest/APIRequest.js +++ b/src/rest/APIRequest.js @@ -1,6 +1,6 @@ 'use strict'; -const https = require('https'); +const https = require('node:https'); const FormData = require('@discordjs/form-data'); const fetch = require('node-fetch'); const { UserAgent } = require('../util/Constants'); diff --git a/src/sharding/Shard.js b/src/sharding/Shard.js index 738d45500..245b3473c 100644 --- a/src/sharding/Shard.js +++ b/src/sharding/Shard.js @@ -1,7 +1,7 @@ 'use strict'; -const EventEmitter = require('events'); -const path = require('path'); +const EventEmitter = require('node:events'); +const path = require('node:path'); const { Error } = require('../errors'); const Util = require('../util/Util'); let childProcess = null; @@ -21,8 +21,8 @@ class Shard extends EventEmitter { constructor(manager, id) { super(); - if (manager.mode === 'process') childProcess = require('child_process'); - else if (manager.mode === 'worker') Worker = require('worker_threads').Worker; + if (manager.mode === 'process') childProcess = require('node:child_process'); + else if (manager.mode === 'worker') Worker = require('node:worker_threads').Worker; /** * Manager that created the shard diff --git a/src/sharding/ShardClientUtil.js b/src/sharding/ShardClientUtil.js index eb674c581..665046be2 100644 --- a/src/sharding/ShardClientUtil.js +++ b/src/sharding/ShardClientUtil.js @@ -44,7 +44,7 @@ class ShardClientUtil { process.send({ _reconnecting: true }); }); } else if (mode === 'worker') { - this.parentPort = require('worker_threads').parentPort; + this.parentPort = require('node:worker_threads').parentPort; this.parentPort.on('message', this._handleMessage.bind(this)); client.on('ready', () => { this.parentPort.postMessage({ _ready: true }); diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js index 7ee74dcb5..85bfd628a 100644 --- a/src/sharding/ShardingManager.js +++ b/src/sharding/ShardingManager.js @@ -1,8 +1,8 @@ 'use strict'; -const EventEmitter = require('events'); -const fs = require('fs'); -const path = require('path'); +const EventEmitter = require('node:events'); +const fs = require('node:fs'); +const path = require('node:path'); const { Collection } = require('@discordjs/collection'); const Shard = require('./Shard'); const { Error, TypeError, RangeError } = require('../errors'); diff --git a/src/structures/interfaces/Collector.js b/src/structures/interfaces/Collector.js index b57dd1634..d5126a264 100644 --- a/src/structures/interfaces/Collector.js +++ b/src/structures/interfaces/Collector.js @@ -1,6 +1,6 @@ 'use strict'; -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); const { Collection } = require('@discordjs/collection'); const { TypeError } = require('../../errors'); const Util = require('../../util/Util'); diff --git a/src/util/DataResolver.js b/src/util/DataResolver.js index 0485d8221..d00df6c38 100644 --- a/src/util/DataResolver.js +++ b/src/util/DataResolver.js @@ -1,8 +1,8 @@ 'use strict'; -const fs = require('fs'); -const path = require('path'); -const stream = require('stream'); +const fs = require('node:fs'); +const path = require('node:path'); +const stream = require('node:stream'); const fetch = require('node-fetch'); const { Error: DiscordError, TypeError } = require('../errors'); const Invite = require('../structures/Invite'); diff --git a/src/util/Util.js b/src/util/Util.js index 6d0944ece..072e4217d 100644 --- a/src/util/Util.js +++ b/src/util/Util.js @@ -1,6 +1,6 @@ 'use strict'; -const { parse } = require('path'); +const { parse } = require('node:path'); const { Collection } = require('@discordjs/collection'); const fetch = require('node-fetch'); const { Colors, Endpoints } = require('./Constants'); diff --git a/test/createGuild.js b/test/createGuild.js index fdb61804a..24826c419 100644 --- a/test/createGuild.js +++ b/test/createGuild.js @@ -1,6 +1,6 @@ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const { token } = require('./auth'); const { Client, Intents } = require('../src'); diff --git a/test/sendtest.js b/test/sendtest.js index 1ca9e22f5..d30d5a014 100644 --- a/test/sendtest.js +++ b/test/sendtest.js @@ -1,8 +1,8 @@ 'use strict'; -const fs = require('fs'); -const path = require('path'); -const util = require('util'); +const fs = require('node:fs'); +const path = require('node:path'); +const util = require('node:util'); const fetch = require('node-fetch'); const { owner, token } = require('./auth.js'); const { Client, Intents, MessageAttachment, MessageEmbed } = require('../src'); diff --git a/test/tester1000.js b/test/tester1000.js index d10430581..ac63f5ff6 100644 --- a/test/tester1000.js +++ b/test/tester1000.js @@ -24,7 +24,7 @@ const commands = { let res; try { res = eval(message.content); - if (typeof res !== 'string') res = require('util').inspect(res); + if (typeof res !== 'string') res = require('node:util').inspect(res); } catch (err) { // eslint-disable-next-line no-console console.error(err.stack); diff --git a/test/tester2000.js b/test/tester2000.js index e3e1822f4..896161ad2 100644 --- a/test/tester2000.js +++ b/test/tester2000.js @@ -36,7 +36,7 @@ const commands = { let res; try { res = eval(message.content); - if (typeof res !== 'string') res = require('util').inspect(res); + if (typeof res !== 'string') res = require('node:util').inspect(res); } catch (err) { // eslint-disable-next-line no-console console.error(err.stack); diff --git a/test/webhooktest.js b/test/webhooktest.js index 19f208985..aed75e40e 100644 --- a/test/webhooktest.js +++ b/test/webhooktest.js @@ -1,8 +1,8 @@ 'use strict'; -const fs = require('fs'); -const path = require('path'); -const util = require('util'); +const fs = require('node:fs'); +const path = require('node:path'); +const util = require('node:util'); const fetch = require('node-fetch'); const { owner, token, webhookChannel, webhookToken } = require('./auth.js'); const { Client, Intents, MessageAttachment, MessageEmbed, WebhookClient } = require('../src');