diff --git a/scripts/commands.ts b/commands/commands.old similarity index 58% rename from scripts/commands.ts rename to commands/commands.old index a48e526..b7c8820 100644 --- a/scripts/commands.ts +++ b/commands/commands.old @@ -1,35 +1,10 @@ -import { Discord, fs} from "../main"; -import { player } from "./enums"; -import { raceText, capitalize, randomInt, encounter } from "./functions"; +import { Discord, fs } from "../main"; +import { player } from "../scripts/enums"; +import { raceText, capitalize, randomInt } from "../scripts/functions"; //===Data stored for use, such as class, race, and last names=== -export const races: Array = ["tree", "ground", "chipmunk"]; -const classes: Array = ["rogue", "berserker", "knight", "ranger", "priest"]; -const lastNames: Array = ["Nutcrack", "Nutmeg", "Seedsower", "McScuiri", "Rodentia", "Arbora", "Patagi"]; -const COLOR: string = "#E81B47"; -const newPlayerTemplate: player = { - "name": "", - "race": "", - "class": "", - "weapon": { - "weaponName": "", - "attackStat": 0, - "defenseStat": 0, - "secondStat": 0 - }, - "level": 1, - "nuts": 0, - "staminaMax": 0, - "stamina": 0, - "dm": false, - "dm_points": 0 -} -export let channels: any = { - general: "", - encounter: "", - preparing: "" -} -export let processes: any = { + +let processes: any = { "test": { title: "Test", description: "For testing", @@ -72,26 +47,20 @@ export let processes: any = { args: "", run: (msg: any, data: player, args: string[], file: any) => printClasses(msg) }, - "create": { - title: "Create", - description: "Create a squirrel, can only be used once", - args: "**name** - the name of the created squirrel\n**race** - The race of the created squirrel, type !races for race options\n**class** - The class of the created squirrel, type !classes for class options", - run: (msg: any, data: player, args: string[], file: any) => create(msg, args, file) - } } //===COMMAND FUNCTIONS== function help(msg: any, args: string[]): void { let argument: string = args[0].toLowerCase(); - if(argument === "") { + if (argument === "") { msg.reply(`Please provide a command, like "!help help", or "!help races"\nAlternatively type "!list" for a list of commands`); - } else if(processes.hasOwnProperty(argument)){ + } else if (processes.hasOwnProperty(argument)) { let embed = new Discord.RichEmbed() .setTitle(processes[argument].title) .setColor(COLOR) .setDescription(processes[argument].description); - if(processes[argument].args === "") { + if (processes[argument].args === "") { embed.addField("Arguments:", `This command has no arguments`); } else { embed.addField("Arguments:", processes[argument].args); @@ -131,49 +100,7 @@ function read(msg: any, data: player): void { msg.channel.send(embed); } -function create(msg: any, args: Array, file: any): boolean { - if (args.length === 3) { - let newPlayer: player = newPlayerTemplate; - let incorrect: string = ""; - incorrect = " race"; - races.some(type => { - if (args[1].toLowerCase() == type) { - incorrect = ""; - return true; - } - }); - - if (incorrect == "") - incorrect = " class"; - else - incorrect += ", and class"; - classes.some(type => { - if (args[2].toLowerCase() == type) { - if (incorrect == " race, and class") - incorrect = " race"; - else - incorrect = ""; - return true; - } - }); - - if (incorrect === "") { - newPlayer.name = args[0] + " " + lastNames[randomInt(0, lastNames.length - 1)]; - newPlayer.race = args[1]; - newPlayer.class = args[2]; - fs.writeFileSync(file, JSON.stringify(newPlayer)); - msg.reply(`Squirrel ${newPlayer.name} has been created`); - return true; - } else { - msg.reply(`Some parameters were entered incorrectly. Remember the format is "create name race class". Your name can be whatever you want, but you have to choose from !race, and !class. You incorrectly entered your:${incorrect}.`); - return false; - } - } else { - msg.reply(`Too many or too few parameters were entered. The format is "create name race class". You only get to choose your first name, don't write a last name.`); - return false; - } -} function nameChange(msg: any, data: player, args: string[], file: any): void { if (data.level == 1) { diff --git a/commands/create.ts b/commands/create.ts new file mode 100644 index 0000000..9112033 --- /dev/null +++ b/commands/create.ts @@ -0,0 +1,34 @@ +import { squirrel } from "../scripts/enums"; +import { newSquirrel, updateSquirrelFile } from "../scripts/functions"; + +module.exports = { + name: 'create', + description: "Create a squirrel, can only be used once", + args: "**name** - the name of the created squirrel\n**race** - The race of the created squirrel, type !races for race options\n**class** - The class of the created squirrel, type !classes for class options", + execute(msg, args) { + if (args.length !== 3) { + msg.reply(`Too many or too few parameters were entered. The format is "create name race class". You only get to choose your first name, don't write a last name.`); + return false; + } + + let newSquirrel: squirrel = squirrel(args[0], args[1], args[2]); + + let incorrect: string = ""; + + if (newSquirrel.race === -1) + incorrect += ` race as ${args[1]}`; + if (newSquirrel.class === -1) + incorrect += ` class as ${args[2]}`; + + if (incorrect === "") { + updateSquirrelFile(msg.author.id, newSquirrel); + msg.reply(`Squirrel ${newSquirrel.name} has been created`); + } else { + msg.reply(`Some parameters were entered incorrectly. Remember the format is "create first_name race class". Your name can be whatever you want, but you have to choose from !race, and !class. You incorrectly entered:${incorrect}.`); + } + } +} + +function squirrel(name: string, race: string, classtype: string): squirrel { + return newSquirrel(name, race, classtype); +} \ No newline at end of file diff --git a/data/playerdata/examplePlayerFile b/data/playerdata/examplePlayerFile new file mode 100644 index 0000000..c20709a --- /dev/null +++ b/data/playerdata/examplePlayerFile @@ -0,0 +1,17 @@ +{ + "name": "Snickers Patagi", + "race": 0, + "class": 2, + "weapon": { + "weaponName": "", + "attackStat": 0, + "defenseStat": 0, + "secondStat": 0 + }, + "level": 1, + "nuts": 0, + "staminaMax": 0, + "stamina": 0, + "dm": false, + "dm_points": 0 +} \ No newline at end of file diff --git a/main.ts b/main.ts index 8841ddd..fbfa74a 100644 --- a/main.ts +++ b/main.ts @@ -1,84 +1,48 @@ // Created by Julia Lange //===Requirements=== -export const Discord = require('discord.js'); -const client = new Discord.Client(); export const fs = require('fs'); +export const Discord = require('discord.js'); + const info = JSON.parse(fs.readFileSync(`./data/info.json`)); +const commandFiles = fs.readdirSync('./commands').filter(file => file.endsWith('.js')); -import { player } from "./scripts/enums"; -import { processes, channels } from "./scripts/commands"; -import { encounterInProgress } from "./scripts/functions"; - - -//===Global editable variables=== +const client = new Discord.Client(); +client.commands = new Discord.Collection(); +for (const file of commandFiles) { + const command = require(`./commands/${file}`); + client.commands.set(command.name, command); +} //===Initalization=== client.on('ready', () => { console.log(`Logged in as ${client.user.tag}!`); - channels.general = client.channels.find(ch => ch.id === info.channels.general); - channels.encounter = client.channels.find(ch => ch.id === info.channels.encounter); - channels.preparing = client.channels.find(ch => ch.id === info.channels.preparing); - // const preparingCollector = new Discord.MessageCollector(preparingChannel); - // preparingCollector.on('collect', msg => { - // console.log(msg.content); - // }); - // setInterval( function() { encounter(encounterChannel); }, 300000 ); - // encounter(encounterChannel); }); //===When receiving messages client.on('message', msg => { //Reasons to exit - if (!msg.content.split(" ")[0].startsWith(info.prefix)) return; // if the message doesn't start with the prefix - switch(msg.channel) { - case channels.encounter: - if(encounterInProgress) return; - encounterChannelMessage(msg); - break; - default: - defaultChannelMessage(msg); - } - + if (!msg.content.split(" ")[0].startsWith(info.prefix) || msg.author.bot) return; // if the message doesn't start with the prefix + + executeCommand(msg); }); // Log the bot in client.login(info.key); - -// Channel Cases -function defaultChannelMessage(msg: any): void { - let messageContent: Array = msg.content.split(" "); // split message into an array on spaces - let command: string = messageContent[0]; // This is the command they are using - +function executeCommand(msg: any) { + const messageContent: Array = msg.content.slice(1).split(" "); // split message into an array on spaces + const command: string = messageContent[0].toLowerCase(); // This is the command they are using let args: Array = [""]; // arguments of the message if (messageContent.length > 1) args = messageContent.slice(1); - let authorId: number = msg.author.id; // Message Author - let playerFile: string = `./data/playerdata/${authorId}.json`; - if (fs.existsSync(playerFile)) { // If they're file exists, they can use commands, otherwise direct them to the create command - let playerData: player = JSON.parse(fs.readFileSync(playerFile)); + if (!client.commands.has(command)) return; - Object.keys(processes).forEach(process => { // See if the command they typed is a command - if(`${info.prefix}${processes[process].title.toLowerCase()}` === command){ - processes[process].run(msg, playerData, args, playerFile); - } - }); - - } else { - if(command === `${info.prefix}create`){ // if they are using the create command - console.log(`Attempting to make a squirrel for ${authorId}`); - if (processes["create"]["create"].run(msg, null, args, playerFile)) - console.log(`Squirrel made succesfully for ${authorId}`); - else - console.log(`Failed to create a squirrel for ${authorId}`); - } else { - msg.reply(`Please make a squirrel before interacting with the bot. To do so please use the create command. For more information on creation type "!help create"`); - } + try { + client.commands.get(command).execute(msg, args); + } catch (e) { + console.error(e); + msg.reply(`Failed to execute the given command for some reason. Sad.`); } -} - -function encounterChannelMessage(msg: any): void { - } \ No newline at end of file diff --git a/scripts/enums.ts b/scripts/enums.ts index 72fc4af..017e9a2 100644 --- a/scripts/enums.ts +++ b/scripts/enums.ts @@ -1,19 +1,19 @@ -export interface player { - name: string; - race: string; - class: string; - weapon: weapon; - nuts: number; - level: number; +export interface squirrel { + name: string; + race: number; + class: number; + weapon: weapon; + nuts: number; + level: number; staminaMax: number; - stamina: number; - dm: boolean; - dm_points: number; + stamina: number; + dm: boolean; + dm_points: number; } export interface weapon { - weaponName: string; - attackStat: number; + weaponName: string; + attackStat: number; defenseStat: number; - secondStat: number; + secondStat: number; } \ No newline at end of file diff --git a/scripts/functions.ts b/scripts/functions.ts index 8f4db41..d291c43 100644 --- a/scripts/functions.ts +++ b/scripts/functions.ts @@ -1,31 +1,57 @@ -import { races, channels } from "./commands"; +import { squirrel } from "../scripts/enums"; +import { fs } from "../main"; -export let encounterInProgress: boolean = false; +const races: Array = ["tree", "ground", "chipmunk"]; +const classes: Array = ["rogue", "berserker", "knight", "ranger", "priest"]; +const lastNames: Array = ["Nutcrack", "Nutmeg", "Seedsower", "McScuiri", "Rodentia", "Arbora", "Patagi"]; +// const COLOR: string = "#E81B47"; -export function encounter(): void { - if (encounterInProgress == false) { // randomInt(1,20) === 20 && - console.log("Starting Encounter"); - encounterInProgress = true; - channels.encounter.send("An encounter is beginning!"); +export function newSquirrel(name: string, race: string, classtype: string): squirrel { + let raceNum: number = -1; + let classNum: number = -1; - channels.encounter.send(`\`■■■ ■■■ ■■■ ■■■\`\n\`■■■ ■■■ ■■■ ■■■\`\n\`■■■ ■■■ ■■■ ■■■\``) - console.log("Encounter finished"); - encounterInProgress = false; - } + if (races.includes(race.toLowerCase())) + raceNum = races.indexOf(race.toLowerCase()); + + if (classes.includes(classtype.toLowerCase())) + classNum = classes.indexOf(classtype.toLowerCase()); + + return { + "name": `${capitalize(name)} ${lastNames[randomInt(0, lastNames.length - 1)]}`, + "race": raceNum, + "class": classNum, + "weapon": { + "weaponName": "", + "attackStat": 0, + "defenseStat": 0, + "secondStat": 0 + }, + "level": 1, + "nuts": 0, + "staminaMax": 0, + "stamina": 0, + "dm": false, + "dm_points": 0 + }; +} + +export function updateSquirrelFile(playerId: string, squirrel: squirrel): void { + let playerFile: string = `./data/playerdata/${playerId}.json`; + fs.writeFileSync(playerFile, JSON.stringify(squirrel)); } export function randomInt(low: number, high: number): number { return Math.floor(Math.random() * (high - low + 1) + low) } -export function raceText(race: string): string { - if (race === races[2]) return capitalize(race); - else if (race === races[0] || race === races[1]) return `${capitalize(race)} Squirrel`; - else { - console.log(`Error ${race} is not a valid race`); - return ""; - } -} +// export function raceText(race: number): string { +// if (race === 2) return capitalize(races[race]); +// else if (race === 0 || race === 1) return `${capitalize(races[race])} Squirrel`; +// else { +// console.log(`Error ${race} is not a valid race`); +// return ""; +// } +// } export function capitalize(toCaps: string): string { return toCaps.charAt(0).toUpperCase() + toCaps.slice(1).toLowerCase(); diff --git a/yarn.lock b/yarn.lock index d90a4b6..4cb5666 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,75 +2,106 @@ # yarn lockfile v1 -"@types/node@^11.9.3": - version "11.13.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.20.tgz#da42fe93d6599f80b35ffeb5006f4c31f40d89ea" - integrity sha512-JE0UpLWZTV1sGcaj0hN+Q0760OEjpgyFJ06DOMVW6qKBducKdJQaIw0TGL6ccj7VXRduIOHLWQi+tHwulZJHVQ== +"@discordjs/collection@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.1.5.tgz#1781c620b4c88d619bd0373a1548e5a6025e3d3a" + integrity sha512-CU1q0UXQUpFNzNB7gufgoisDHP7n+T3tkqTsp3MNUkVJ5+hS3BCvME8uCXAUFlz+6T2FbTCu75A+yQ7HMKqRKw== -async-limiter@~1.0.0: +"@types/node@^13.7.7": + version "13.7.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.7.tgz#1628e6461ba8cc9b53196dfeaeec7b07fa6eea99" + integrity sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg== + +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +delayed-stream@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" - integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg== + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -discord.js@^11.5.1: - version "11.5.1" - resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-11.5.1.tgz#910fb9f6410328581093e044cafb661783a4d9e8" - integrity sha512-tGhV5xaZXE3Z+4uXJb3hYM6gQ1NmnSxp9PClcsSAYFVRzH6AJH74040mO3afPDMWEAlj8XsoPXXTJHTxesqcGw== +discord.js@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-12.0.1.tgz#58574c0c9acc598095f943d6b14da4725d37b8b9" + integrity sha512-lUlrkAWSb5YTB1WpSZHjeUXxGlHK8VDjrlHLEP4lJj+etFAellURpmRYl29OPJ/7arQWB879pP4rvhhzpdOF7w== dependencies: - long "^4.0.0" - prism-media "^0.0.3" - snekfetch "^3.6.4" - tweetnacl "^1.0.0" - ws "^6.0.0" + "@discordjs/collection" "^0.1.5" + abort-controller "^3.0.0" + form-data "^3.0.0" + node-fetch "^2.6.0" + prism-media "^1.2.0" + setimmediate "^1.0.5" + tweetnacl "^1.0.3" + ws "^7.2.1" -dom-walk@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" - integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg= +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== -global@^4.3.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" - integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== +form-data@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682" + integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg== dependencies: - min-document "^2.19.0" - process "^0.11.10" + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== +fs@^0.0.1-security: + version "0.0.1-security" + resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.1-security.tgz#8a7bd37186b6dddf3813f23858b57ecaaf5e41d4" + integrity sha1-invTcYa23d84E/I4WLV+yq9eQdQ= -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== + +mime-types@^2.1.12: + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== dependencies: - dom-walk "^0.1.0" + mime-db "1.43.0" -prism-media@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-0.0.3.tgz#8842d4fae804f099d3b48a9a38e3c2bab6f4855b" - integrity sha512-c9KkNifSMU/iXT8FFTaBwBMr+rdVcN+H/uNv1o+CuFeTThNZNTOrQ+RgXA1yL/DeLk098duAeRPP3QNPNbhxYQ== +node-fetch@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= +prism-media@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-1.2.1.tgz#168f323712bcaacb1d70ae613bf9d9dc44cf43d4" + integrity sha512-R3EbKwJiYlTvGwcG1DpUt+06DsxOGS5W4AMEHT7oVOjG93MjpdhGX1whHyjnqknylLMupKAsKMEXcTNRbPe6Vw== -snekfetch@^3.6.4: - version "3.6.4" - resolved "https://registry.yarnpkg.com/snekfetch/-/snekfetch-3.6.4.tgz#d13e80a616d892f3d38daae4289f4d258a645120" - integrity sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw== +setimmediate@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= -tweetnacl@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.1.tgz#2594d42da73cd036bd0d2a54683dd35a6b55ca17" - integrity sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A== +tweetnacl@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" + integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== -ws@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" +ws@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e" + integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==