Selection of the ideal Lavalink node according to the location of the Discord server #88

karelkryda · 2021-02-20T20:52:46Z

It is quite likely that there will be some errors in the code. I wrote this code in JavaScript and then transcribed it into TypeScript, a language I don't quite understand.

The principle is that I added the "region" option to the node options, which can be either a string or a array of strings.
Furthermore, the Player now also has the "region" option, which is the region of the Discord server (string).
If the user specifies the Node he wants to use when creating the Player, that one is selected (as before).
If the user has provided the "region" option, the corresponding Nodes are selected.

If none is found, null is returned
If one matching Node is found, it will return
If more than one matching Nodes are found, the best one will be selected according to the statistics of the given Node.

If no Node is returned or the "region" option is not provided, the best one is selected according to the statistics of that Node (as before)

Latest Erela.js

Update repo

Code update

acollierr17 · 2021-03-09T20:54:22Z

Has this code been tested?

karelkryda · 2021-03-09T21:13:07Z

Has this code been tested?

yeah, I tested it - but in JavaScript => idk if I rewrote it to TypeScript correctly

JonasSchiott · 2021-03-12T09:39:39Z

Has this code been tested?

yeah, I tested it - but in JavaScript => idk if I rewrote it to TypeScript correctly

The thing you gotta realise is, Erela is our baby, hehe. We'd prefer it to be without bugs, and your codebase and amount of changes are almost too big to get a grasp of in one sitting. When we ask if your code has been tested, you respond with "only before, when I wrote it in a language I understand." What do we do with this? I suppose @acollierr17 & myself are forced to do quite some testing with this to avoid bugs if possible.

karelkryda · 2021-03-12T13:16:45Z

Has this code been tested?

yeah, I tested it - but in JavaScript => idk if I rewrote it to TypeScript correctly

The thing you gotta realise is, Erela is our baby, hehe. We'd prefer it to be without bugs, and your codebase and amount of changes are almost too big to get a grasp of in one sitting. When we ask if your code has been tested, you respond with "only before, when I wrote it in a language I understand." What do we do with this? I suppose @acollierr17 & myself are forced to do quite some testing with this to avoid bugs if possible.

I've already dealt with someone from you from Discord that I don't know much about TS. That man told me that someone would help me with the transport from JS to TS. I tried to make the code correct. Respectively, the code should be functional, I'm just not sure about the types of variables in the return and input methods.

there were a lot of commits, since I already made one pull request. Unfortunately, I was unable to reset changes to the repository. So that's the reason for so many commits

Strandxo · 2021-06-11T08:19:23Z

src/structures/Player.ts

@@ -119,7 +124,9 @@ export class Player {
    if (options.textChannel) this.textChannel = options.textChannel;

    const node = this.manager.nodes.get(options.node);
-    this.node = node || this.manager.leastLoadNodes.first();
+    if (node) this.node = node


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

if (node) this.node = node

if (node) {this.node = node}

Strandxo · 2021-06-11T08:19:24Z

src/structures/Node.ts

@@ -58,6 +58,11 @@ function check(options: NodeOptions) {
    typeof options.retryDelay !== "number"
  )
    throw new TypeError('Node option "retryDelay" must be a number.');
+
+  if (typeof options.region !== "undefined" && 


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

if (typeof options.region !== "undefined" &&

if (typeof options.region !== "undefined" &&

Strandxo · 2021-06-11T08:19:25Z

src/structures/Manager.ts

+            return null;
+        else if (nodes.size === 1)
+            return nodes.first();
+        else if (nodes.size > 1)


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

else if (nodes.size > 1)

else if (nodes.size > 1)

Strandxo · 2021-06-11T08:19:26Z

src/structures/Manager.ts

+                    return node.connected && node.options.region.toLowerCase() == region.toLowerCase()
+            });
+
+        if (!nodes)


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

if (!nodes)

if (!nodes)

Strandxo · 2021-06-11T08:19:27Z

src/structures/Player.ts

@@ -119,7 +124,9 @@ export class Player {
    if (options.textChannel) this.textChannel = options.textChannel;

    const node = this.manager.nodes.get(options.node);
-    this.node = node || this.manager.leastLoadNodes.first();
+    if (node) this.node = node
+    else if (options.region) this.node = this.manager.nearestNode(options.region);


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

else if (options.region) this.node = this.manager.nearestNode(options.region);

else if (options.region) {this.node = this.manager.nearestNode(options.region);}

Strandxo · 2021-06-11T08:19:28Z

src/structures/Manager.ts

+                    return node.connected
+                else if (Array.isArray(node.options.region))
+                    return node.connected && node.options.region.includes(region)
+                else


Codacy has a fix for the issue: Expected { after 'else'.

Suggested change

else

else

Strandxo · 2021-06-11T08:19:30Z

src/structures/Manager.ts

+
+        if (!nodes)
+            return null;
+        else if (nodes.size === 1)


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

else if (nodes.size === 1)

else if (nodes.size === 1)

Strandxo · 2021-06-11T08:19:31Z

src/structures/Player.ts

-    this.node = node || this.manager.leastLoadNodes.first();
+    if (node) this.node = node
+    else if (options.region) this.node = this.manager.nearestNode(options.region);
+    if (!this.node) this.node = this.manager.leastLoadNodes.first()


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

if (!this.node) this.node = this.manager.leastLoadNodes.first()

if (!this.node) {this.node = this.manager.leastLoadNodes.first()}

Strandxo · 2021-06-11T08:19:32Z

src/structures/Manager.ts

+            .filter((node) => {
+                if (!node.options.region)
+                    return node.connected
+                else if (Array.isArray(node.options.region))


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

else if (Array.isArray(node.options.region))

else if (Array.isArray(node.options.region))

Strandxo · 2021-06-11T08:19:33Z

src/structures/Player.ts

@@ -10,6 +10,9 @@ function check(options: PlayerOptions) {
    throw new TypeError(
      'Player option "guild" must be present and be a non-empty string.'
    );
+
+  if (options.region && !/^\d+$/.test(options.region))
+    throw new TypeError('Player option "region" must be a non-empty string.');


Codacy has a fix for the issue: Strings must use doublequote.

Suggested change

throw new TypeError('Player option "region" must be a non-empty string.');

throw new TypeError("Player option \"region\" must be a non-empty string.");

Strandxo · 2021-06-11T08:19:34Z

src/structures/Node.ts

+  if (typeof options.region !== "undefined" && 
+      ((typeof options.region !== "string" || 
+        !/.+/.test(options.region)) && (!Array.isArray(options.region) || options.region.length === 0 || !/.+/.test(options.region[0]))))
+    throw new TypeError('Node option "region" must be a non-empty string or array.');


Codacy has a fix for the issue: Strings must use doublequote.

Suggested change

throw new TypeError('Node option "region" must be a non-empty string or array.');

throw new TypeError("Node option \"region\" must be a non-empty string or array.");

Strandxo · 2021-06-11T08:19:35Z

src/structures/Manager.ts

+    public nearestNode(region: string): Node {
+        const nodes = this.nodes
+            .filter((node) => {
+                if (!node.options.region)


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

if (!node.options.region)

if (!node.options.region)

Strandxo · 2021-06-11T08:19:36Z

src/structures/Player.ts

@@ -10,6 +10,9 @@ function check(options: PlayerOptions) {
    throw new TypeError(
      'Player option "guild" must be present and be a non-empty string.'
    );
+
+  if (options.region && !/^\d+$/.test(options.region))


Codacy has a fix for the issue: Expected { after 'if' condition.

Suggested change

if (options.region && !/^\d+$/.test(options.region))

if (options.region && !/^\d+$/.test(options.region))

karelkryda added 16 commits November 21, 2020 11:26

Merge pull request #1 from Solaris9/master

dcbea31

Latest Erela.js

Merge pull request #2 from Solaris9/master

9e12f6e

Update repo

Added removeDuplicates function

98b7ca2

Added isUnique and getUnique functions

14da024

Changed queue type to Queue

4227345

Added code analysis

1f66ee8

track should be Track

e7120af

Added several isUnresolvedTrack checks

d03e5e7

Merge pull request #3 from MenuDocs/master

bf5cc51

Code update

Added Region methods

1cd3265

Added regions

07c8224

Added region

49ce719

Fixes

fd7e259

lmao

1b0d809

lmao #2

8d6b7ca

Delete codeql-analysis.yml

bb2614e

Strandxo requested review from acollierr17, JonasSchiott and t3ned March 9, 2021 20:38

anishshobithps added the enhancement New feature or request label Apr 19, 2021

anishshobithps added this to the v3 milestone Apr 19, 2021

Strandxo reviewed Jun 11, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Selection of the ideal Lavalink node according to the location of the Discord server #88

Selection of the ideal Lavalink node according to the location of the Discord server #88

karelkryda commented Feb 20, 2021

acollierr17 commented Mar 9, 2021

karelkryda commented Mar 9, 2021 •

edited

Loading

JonasSchiott commented Mar 12, 2021

karelkryda commented Mar 12, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

Strandxo Jun 11, 2021

	if (typeof options.region !== "undefined" &&
	if (typeof options.region !== "undefined" &&

	else if (options.region) this.node = this.manager.nearestNode(options.region);
	else if (options.region) {this.node = this.manager.nearestNode(options.region);}

	if (!this.node) this.node = this.manager.leastLoadNodes.first()
	if (!this.node) {this.node = this.manager.leastLoadNodes.first()}

	else if (Array.isArray(node.options.region))
	else if (Array.isArray(node.options.region))

	throw new TypeError('Player option "region" must be a non-empty string.');
	throw new TypeError("Player option \"region\" must be a non-empty string.");

	throw new TypeError('Node option "region" must be a non-empty string or array.');
	throw new TypeError("Node option \"region\" must be a non-empty string or array.");

	if (options.region && !/^\d+$/.test(options.region))
	if (options.region && !/^\d+$/.test(options.region))

Selection of the ideal Lavalink node according to the location of the Discord server #88

Are you sure you want to change the base?

Selection of the ideal Lavalink node according to the location of the Discord server #88

Conversation

karelkryda commented Feb 20, 2021

acollierr17 commented Mar 9, 2021

karelkryda commented Mar 9, 2021 • edited Loading

JonasSchiott commented Mar 12, 2021

karelkryda commented Mar 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karelkryda commented Mar 9, 2021 •

edited

Loading