diff --git a/.gitignore b/.gitignore index 820aae3..50c34b1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /node_modules/ yarn-error.log /build/ -settings.json \ No newline at end of file +settings.json +settings.db \ No newline at end of file diff --git a/package.json b/package.json index 96e4fec..5beaa4a 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "dependencies": { "discord.js": "^13.6.0", "dotenv": "^16.0.0", - "express": "^4.18.1" + "express": "^4.18.1", + "sqlite3": "^5.1.2" } } diff --git a/src/DiscordClient.ts b/src/DiscordClient.ts index ea3c830..5e90769 100644 --- a/src/DiscordClient.ts +++ b/src/DiscordClient.ts @@ -8,6 +8,7 @@ import { ThreadMember, MessageOptions, TextBasedChannel, + Guild, } from 'discord.js'; import MessageHandler from './messages/MessageHandler'; import ReactionHandler from './ReactionHandler'; @@ -17,12 +18,13 @@ import RoleChannelManager from './roles/RoleChannelManager'; import Settings from './Settings'; import DMManager from './twitch/DMManager'; import FeatureChecker from './FeatureChecker'; +import GuildSettings from './settings/GuildSettings'; /** * The discord client handler and initializer of the bot */ export default class DiscordClient { - static _client: Client = new Client({ + public static _client: Client = new Client({ intents: [ Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_MESSAGES, @@ -31,44 +33,57 @@ export default class DiscordClient { ], }); + public static _safeGuilds: Guild[] = []; + constructor() { - new FeatureChecker(); - new MessageHandler(); - new ReactionHandler(); DiscordClient._client.on('ready', this.onReady.bind(this)); DiscordClient._client.on('threadCreate', this.onThreadCreate); + DiscordClient._client.on( + 'guildCreate', + (guild: Guild): Promise => new FeatureChecker().checkGuild(guild) + ); } /** * Logs the discord client into the discord api and starts the handlers */ login(): void { - DiscordClient._client - .login(process.env.DISCORD_TOKEN) - .catch(console.error) - .then((): void => { - if (Settings.settings['twitch-id'] !== '' && process.env.TWITCH_TOKEN) - this.startTwitch(); - }); + DiscordClient._client.login(process.env.DISCORD_TOKEN).catch(console.error); } /** * Fires when the Discord bot is ready */ private async onReady(): Promise { + DiscordClient._safeGuilds = DiscordClient._client.guilds.cache.toJSON(); + for (const guild of DiscordClient._safeGuilds) + if (!GuildSettings.settings(guild.id)) + GuildSettings.saveSettings(guild, { + permissionRoles: [], + roles: [], + streamers: [], + }); + await new FeatureChecker().check(); + new MessageHandler(); + new ReactionHandler(); + if (Settings.settings['twitch-id'] !== '' && process.env.TWITCH_TOKEN) + this.startTwitch(); this.joinAllThreads(); new TalkingChannel(); if (!DiscordClient._client.application?.owner) await DiscordClient._client.application?.fetch().catch(console.error); MessageHandler.addCommands(); - if (Settings.settings.roles.length !== 0) new RoleChannelManager(); + for (const guild of DiscordClient._safeGuilds) { + if ((await GuildSettings.settings(guild.id)).roles.length !== 0) + new RoleChannelManager(guild).run(); + } } /** * Joins all threads to be available there */ private joinAllThreads(): void { - for (const guild of DiscordClient._client.guilds.cache.toJSON()) + for (const guild of DiscordClient._safeGuilds) for (const threadChannel of ( guild.channels.cache.filter( (channel: GuildChannel | ThreadChannel): boolean => @@ -86,7 +101,7 @@ export default class DiscordClient { * Starts doing stuff with Twitch for the #live channel and DM notification handling */ private startTwitch(): void { - new LiveChannel(); + for (const guild of DiscordClient._safeGuilds) new LiveChannel(guild.id); new DMManager(); } diff --git a/src/FeatureChecker.ts b/src/FeatureChecker.ts index f7108c6..ac670f0 100644 --- a/src/FeatureChecker.ts +++ b/src/FeatureChecker.ts @@ -1,4 +1,8 @@ +import { Guild } from 'discord.js'; +import DiscordClient from './DiscordClient'; import Settings from './Settings'; +import GuildSettings from './settings/GuildSettings'; +import { GuildInfo } from './settings/SettingsDB'; /** * Checks what features are enabled in the settings @@ -14,22 +18,17 @@ export default class FeatureChecker { */ #crash: boolean = false; - constructor() { + public async check() { if (Settings.settings.logging === 'verbose') this.status('Logging set to verbose'); - if (Settings.settings['permission-roles'].length === 0) - this.warning('No permitted roles set (field "permission-roles" empty)'); - if (Settings.settings.roles.length === 0) this.status('Roles disabled'); - else this.status('Roles enabled'); + for (const guild of DiscordClient._client.guilds.cache.toJSON()) + await this.checkGuild(guild); + if (Settings.settings['twitch-id']) if (process.env.TWITCH_TOKEN) this.status('Twitch enabled'); else this.warning('No Twitch token provided'); else if (process.env.TWITCH_TOKEN) this.warning('No Twitch ID provided'); else this.status('Twitch disabled'); - if (Settings.settings.roles.length > 25) - this.error( - 'Currently, only a maximum of 25 roles is allowed. If you need more, file an issue at https://github.com/TrojanerHD/TrojanerBot/issues/new' - ); if ( process.argv[ process.argv.findIndex((value: string): boolean => value === '-r') + 1 @@ -42,6 +41,38 @@ export default class FeatureChecker { if (this.#crash) process.exit(1); } + public async checkGuild(guild: Guild): Promise { + const guildInfo: string = `for guild ${guild.id} (${guild.name})`; + let error: boolean = false; + try { + const info: GuildInfo = await GuildSettings.settings(guild.id); + if (info.permissionRoles.length === 0) + this.warning(`No permitted roles set for ${guildInfo}`); + if (info.roles.length === 0) this.status(`Roles disabled ${guildInfo}`); + else this.status(`Roles enabled ${guildInfo}`); + if (info.roles.length > 25) { + error = true; + this.error( + `Currently, only a maximum of 25 roles is allowed. Guild ${guild.id} (${guild.name}) has more than 25 roles. If you need more, file an issue at https://github.com/TrojanerHD/TrojanerBot/issues/new`, + false + ); + } + } catch (e: unknown) { + error = true; + this.error( + `Could not load information ${guildInfo} with reason ${e}`, + false + ); + } finally { + if (error) { + DiscordClient._safeGuilds = DiscordClient._safeGuilds.filter( + (otherGuild: Guild) => otherGuild.id !== guild.id + ); + this.warning(`Limited features due to problems ${guildInfo}`); + } + } + } + /** * Appends a warning to the log output * @param message The warning message to append @@ -64,8 +95,8 @@ export default class FeatureChecker { * Appends an error to the log output and will crash the bot * @param message The error message to append */ - private error(message: string): void { + private error(message: string, crash: boolean = true): void { this.#message += `Error: ${message}\n`; - this.#crash = true; + if (!this.#crash) this.#crash = crash; } } diff --git a/src/ReactionHandler.ts b/src/ReactionHandler.ts index e7764b2..5603c6c 100644 --- a/src/ReactionHandler.ts +++ b/src/ReactionHandler.ts @@ -10,7 +10,8 @@ import { import DiscordClient from './DiscordClient'; import assignRoles from './roles/assignRoles'; import MessageHandler from './messages/MessageHandler'; -import Settings, { RolesField } from './Settings'; +import { RolesField } from './settings/SettingsDB'; +import GuildSettings from './settings/GuildSettings'; /** * Handles reactions (button presses, slash-commands) @@ -26,14 +27,16 @@ export default class ReactionHandler { * Fires whenever an interaction has been made * @param interaction The interaction that has happened */ - private onReaction(interaction: Interaction): void { + private async onReaction(interaction: Interaction): Promise { // Checks whether the interaction was a button if (interaction.isButton()) { // If the id of the button is a role name, the interaction's origin is from the role picker - const settingsRole: RolesField | undefined = Settings.settings.roles.find( - (role: RolesField): boolean => - role.name.toLowerCase() === interaction.customId - ); + const settingsRole: RolesField | undefined = interaction.guildId + ? (await GuildSettings.settings(interaction.guildId)).roles.find( + (role: RolesField): boolean => + role.name.toLowerCase() === interaction.customId + ) + : undefined; if (settingsRole !== undefined) { // Hack to not reply with anything interaction.reply({}).catch((reason: any): void => { @@ -62,7 +65,8 @@ export default class ReactionHandler { interaction .reply({ content: 'Select your roles', - components: this.generateRoleSelectorComponent( + components: await this.generateRoleSelectorComponent( + interaction.guildId, interaction.member as GuildMember | null ), ephemeral: true, @@ -84,16 +88,22 @@ export default class ReactionHandler { * @param member The guild member the selector is created for * @returns A message action row array containing all selectable roles */ - private generateRoleSelectorComponent(member: GuildMember | null): MessageActionRow[] { + private async generateRoleSelectorComponent( + guild: string | null, + member: GuildMember | null + ): Promise { const messageActionRows: MessageActionRow[] = []; let currentMessageActionRow: MessageActionRow; + if (guild === null) return []; + + const roles = (await GuildSettings.settings(guild)).roles; // Every row can contain up to five roles - for (let i = 0; i < Settings.settings.roles.length / 5; i++) { + for (let i = 0; i < roles.length / 5; i++) { currentMessageActionRow = new MessageActionRow(); messageActionRows.push(currentMessageActionRow); // Add the current five roles as component currentMessageActionRow.addComponents( - Settings.settings.roles.slice(i * 5, i * 5 + 5).map( + roles.slice(i * 5, i * 5 + 5).map( // Map the roles stored in settings (role: RolesField): MessageActionRowComponentResolvable => ({ customId: role.name.toLowerCase(), @@ -121,7 +131,8 @@ export default class ReactionHandler { interaction .editReply({ content: 'Select your roles', - components: this.generateRoleSelectorComponent( + components: await this.generateRoleSelectorComponent( + interaction.guildId, interaction.member as GuildMember | null ), }) diff --git a/src/Settings.ts b/src/Settings.ts index cb6dcaa..ff8d186 100644 --- a/src/Settings.ts +++ b/src/Settings.ts @@ -2,16 +2,8 @@ import { Channel } from './messages/StreamerCommand'; import fs from 'fs'; import DMManager from './twitch/DMManager'; -export interface RolesField { - name: string; - emoji: string; - description?: string; -} export interface SettingsJSON { 'twitch-id': string; - 'permission-roles': string[]; - roles: RolesField[]; - streamers: string[]; logging: 'verbose' | 'errors' | 'warnings'; 'streamer-subscriptions': Channel[]; 'express-port'?: number; @@ -34,9 +26,6 @@ export default class Settings { */ private static _settings: SettingsJSON = { 'twitch-id': '', - 'permission-roles': [], - roles: [], - streamers: [], logging: 'warnings', 'streamer-subscriptions': [], }; diff --git a/src/TalkingChannel.ts b/src/TalkingChannel.ts index 86323d6..5b5a247 100644 --- a/src/TalkingChannel.ts +++ b/src/TalkingChannel.ts @@ -22,7 +22,7 @@ export default class TalkingChannel { 'voiceStateUpdate', this.onVoiceStateUpdate.bind(this) ); - for (const guild of DiscordClient._client.guilds.cache.toJSON()) + for (const guild of DiscordClient._safeGuilds) for (const channel of guild.channels.cache.toJSON()) if (channel.name.startsWith('Talking ')) channel.delete().catch(console.error); diff --git a/src/messages/DeployCommand.ts b/src/messages/DeployCommand.ts index d786284..b5ae954 100644 --- a/src/messages/DeployCommand.ts +++ b/src/messages/DeployCommand.ts @@ -52,7 +52,7 @@ export default class DeployCommand extends Command { .then(this.commandsFetched) .catch(console.error); - for (const guild of DiscordClient._client.guilds.cache.toJSON()) + for (const guild of DiscordClient._safeGuilds) guild.commands .fetch() .then(this.commandsFetched) diff --git a/src/messages/MessageHandler.ts b/src/messages/MessageHandler.ts index 7894212..df1b28e 100644 --- a/src/messages/MessageHandler.ts +++ b/src/messages/MessageHandler.ts @@ -14,7 +14,7 @@ import DeployCommand from './DeployCommand'; import LinkResolve from './LinkResolve'; import Command from './Command'; import CommandPermissions from './permissions/CommandPermissions'; -import Settings from '../Settings'; +import GuildSettings from '../settings/GuildSettings'; export type ApplicationCommandType = ApplicationCommand<{ guild: GuildResolvable; @@ -55,12 +55,13 @@ export default class MessageHandler { DiscordClient._client.application?.commands.set(dmCommands); - for (const guild of DiscordClient._client.guilds.cache.toJSON()) { + for (const guild of DiscordClient._safeGuilds) { guild.commands .fetch() .then((): void => { - const commandPermissions: CommandPermissions = - new CommandPermissions(); + const commandPermissions: CommandPermissions = new CommandPermissions( + guild + ); guild.commands .set(guildCommands) .then(commandPermissions.onCommandsSet.bind(commandPermissions)) @@ -75,15 +76,17 @@ export default class MessageHandler { * Also checks for a message link in the message that could be processed as quote * @param message The message to be processed */ - onMessage(message: Message): void { + async onMessage(message: Message): Promise { if (message.channel.type === 'DM' || message.author.bot) return; if (message.content.match(/https:\/\/discord(app)?\.(com|gg)\/channels/)) new LinkResolve().handleCommand(message.channel, message); if (message.content === '!deploy') { + const permissionRoles = (await GuildSettings.settings(message.guildId!)) + .permissionRoles; if ( !message.member!.roles.cache.some((role: Role): boolean => - Settings.settings['permission-roles'].includes(role.name) + permissionRoles.includes(role.name) ) ) { message diff --git a/src/messages/permissions/CommandPermissions.ts b/src/messages/permissions/CommandPermissions.ts index 428e877..b587752 100644 --- a/src/messages/permissions/CommandPermissions.ts +++ b/src/messages/permissions/CommandPermissions.ts @@ -1,6 +1,7 @@ import { ApplicationCommandPermissionData, Collection, + Guild, Role, Snowflake, } from 'discord.js'; @@ -11,12 +12,18 @@ import Settings, { SettingsJSON } from '../../Settings'; import { ApplicationCommandType } from '../MessageHandler'; import Authentication from './Authentication'; import { RequestOptions } from 'https'; +import GuildSettings from '../../settings/GuildSettings'; /** * Set permissions for commands */ export default class CommandPermissions { #commands?: Collection; + #guild: Guild; + + constructor(guild: Guild) { + this.#guild = guild; + } /** * Is to be called after commands have been set @@ -47,7 +54,9 @@ export default class CommandPermissions { (command: ApplicationCommandType): boolean => !command.defaultPermission )) { const body: { permissions: ApplicationCommandPermissionData[] } = { - permissions: Settings.settings['permission-roles'] + permissions: ( + await GuildSettings.settings(this.#guild.id) + ).permissionRoles .filter((roleName: string): boolean => command.guild!.roles.cache.some( (role: Role): boolean => role.name === roleName diff --git a/src/roles/RoleChannelManager.ts b/src/roles/RoleChannelManager.ts index 579b804..d68c6ee 100644 --- a/src/roles/RoleChannelManager.ts +++ b/src/roles/RoleChannelManager.ts @@ -1,40 +1,47 @@ import { EmbedFieldData, + Guild, GuildChannel, MessageEmbed, NewsChannel, TextChannel, ThreadChannel, } from 'discord.js'; -import Settings, { RolesField } from '../Settings'; -import DiscordClient from '../DiscordClient'; import manageRoles from './manageRoles'; import { GuildTextChannel } from '../messages/Command'; +import { RolesField } from '../settings/SettingsDB'; +import GuildSettings from '../settings/GuildSettings'; /** * Manages the roles for each user with a message with button in a channel */ export default class RoleChannelManager { - constructor() { - for (const guild of DiscordClient._client.guilds.cache.toJSON()) { - const rolesChannel: GuildTextChannel | undefined = - guild.channels.cache.find( - (channel: GuildChannel | ThreadChannel): boolean => - channel.name === 'roles' && - (channel instanceof TextChannel || - channel instanceof ThreadChannel || - channel instanceof NewsChannel) - ) as GuildTextChannel | undefined; - if (!rolesChannel) continue; + #guild: Guild; - const embed: MessageEmbed = this.generateEmbed(); + constructor(guild: Guild) { + this.#guild = guild; + } + + public async run() { + const rolesChannel: GuildTextChannel | undefined = + this.#guild.channels.cache.find( + (channel: GuildChannel | ThreadChannel): boolean => + channel.name === 'roles' && + (channel instanceof TextChannel || + channel instanceof ThreadChannel || + channel instanceof NewsChannel) + ) as GuildTextChannel | undefined; + if (!rolesChannel) return; - manageRoles(rolesChannel, embed); - } + const embed: MessageEmbed = await this.generateEmbed(); + + manageRoles(rolesChannel, embed); } - private generateEmbed(): MessageEmbed { - const roles: RolesField[] = Settings.settings.roles; + private async generateEmbed(): Promise { + const roles: RolesField[] = (await GuildSettings.settings(this.#guild.id)) + .roles; + const errorRole: boolean = roles.some( (role: RolesField): boolean => !role.emoji || !role.name ); @@ -50,7 +57,7 @@ export default class RoleChannelManager { .setTimestamp(Date.now()) .setTitle('Role Selector') .setFields( - Settings.settings.roles.map( + roles.map( (role: RolesField): EmbedFieldData => ({ name: role.name, value: role.description || '*No description provided*', diff --git a/src/roles/assignRoles.ts b/src/roles/assignRoles.ts index e9aba34..7f74889 100644 --- a/src/roles/assignRoles.ts +++ b/src/roles/assignRoles.ts @@ -1,6 +1,6 @@ import { ButtonInteraction, GuildMember, Role } from 'discord.js'; import ReactionHandler from '../ReactionHandler'; -import { RolesField } from '../Settings'; +import { RolesField } from '../settings/SettingsDB'; /** * The handler for when a user clicks on a role button in the role selection message diff --git a/src/settings/DatabaseHelper.ts b/src/settings/DatabaseHelper.ts new file mode 100644 index 0000000..f168be4 --- /dev/null +++ b/src/settings/DatabaseHelper.ts @@ -0,0 +1,134 @@ +import { Database } from 'sqlite3'; + +export interface HasId extends Record { + id: string; +} + +export default abstract class DatabaseHelper { + #db: Database; + + constructor(file: string) { + this.#db = new Database(file); + } + + protected createTable(tableName: string, columns: string[]): Promise { + let sql: string = `CREATE TABLE IF NOT EXISTS ${tableName} (`; + for (const [index, column] of columns.entries()) { + sql += column; + if (index !== columns.length - 1) sql += ', '; + } + sql += ')'; + return this.runQuery(sql, []); + } + + /** + * Inserts or updates an object in the table, depending on whether there is already a row with the id stored in the table + * @param tableName The table to insert or update to + * @param data The data to insert or update + */ + protected async insertOrUpdate(tableName: string, data: T): Promise { + const id = data.id; + const rows = await this.select(tableName, ['id'], `id = ${id}`); + if (rows.length === 0) return this.insert(tableName, data); + + return this.update(tableName, data, `id = '${id}'`); + } + + protected select( + tableName: string, + columns: string[], + whereClause?: string + ): Promise { + let sql: string = 'SELECT '; + for (const [index, column] of columns.entries()) { + sql += column; + if (index !== columns.length - 1) { + sql += ', '; + } + } + sql += ` FROM ${tableName}`; + if (whereClause !== undefined) sql += ` WHERE ${whereClause}`; + + return this.getAllRows(sql, []); + } + + private insert(tableName: string, data: T) { + let sql: string = `INSERT INTO ${tableName} (`; + const keys = Object.keys(data); + for (const [index, key] of keys.entries()) { + sql += key; + if (index !== keys.length - 1) sql += ', '; + } + + sql += ') VALUES ('; + + for (const [index, key] of keys.entries()) { + sql += `'${data[key]}'`; + if (index !== keys.length - 1) sql += ', '; + } + + sql += ')'; + this.runQuery(sql, []); + } + + private update( + tableName: string, + data: T, + whereClause?: string + ): Promise { + let sql = `UPDATE ${tableName} SET `; + const keys = Object.keys(data); + for (const [index, key] of keys.entries()) { + sql += `${key} = '${data[key]}'`; + if (index !== keys.length - 1) sql += ', '; + } + + if (whereClause) sql += ` WHERE ${whereClause}`; + return this.runQuery(sql, []); + } + + /** + * A wrapper around the Database.run function of the sqlite3 library + * @param sql The SQL query to be executed + * @param params Parameters for placeholders. Automatically sanitized + * @returns A void promise, for error handling only + */ + private runQuery(sql: string, params: any[]): Promise { + return new Promise((resolve, reject) => { + this.#db.run(sql, params, (err: Error) => { + if (err) reject(err); + resolve(); + }); + }); + } + + /** + * A wrapper around the Database.get function of the sqlite3 library + * @param sql The SQL query to be executed + * @param params Parameters for placeholders. Automatically sanitized + * @returns A promise for an any object containing the data of the row the query fetched + */ + protected getRow(sql: string, params: any[]): Promise { + return new Promise((resolve, reject) => { + this.#db.get(sql, params, (err: Error, row: any) => { + if (err) reject(err); + resolve(row); + }); + }); + } + + /** + * A wrapper around the Database.all function of the sqlite3 library + * @param sql The SQL query to be executed + * @param params Parameters for placeholders. Automatically sanitized + * @returns A promise for an any array containing all rows the query fetched + */ + private getAllRows(sql: string, params: any[]): Promise { + return new Promise((resolve, reject) => { + this.#db.all(sql, params, (err: Error, rows: any[]) => { + if (err) reject(err); + resolve(rows); + }); + }); + } +} diff --git a/src/settings/GuildSettings.ts b/src/settings/GuildSettings.ts new file mode 100644 index 0000000..7eec4f7 --- /dev/null +++ b/src/settings/GuildSettings.ts @@ -0,0 +1,16 @@ +import { Guild } from 'discord.js'; +import FeatureChecker from '../FeatureChecker'; +import SettingsDB, { GuildInfo } from './SettingsDB'; + +export default class GuildSettings { + static readonly #db = new SettingsDB('./settings.db'); + + public static settings(id: string): Promise { + return GuildSettings.#db.getGuild(id); + } + + public static async saveSettings(guild: Guild, settings: GuildInfo): Promise { + GuildSettings.#db.updateGuild(guild.id, settings); + new FeatureChecker().checkGuild(guild); + } +} diff --git a/src/settings/SettingsDB.ts b/src/settings/SettingsDB.ts new file mode 100644 index 0000000..01c00d0 --- /dev/null +++ b/src/settings/SettingsDB.ts @@ -0,0 +1,122 @@ +import DatabaseHelper from './DatabaseHelper'; + +export interface RolesField { + id: string; + server: string; + name: string; + emoji: string; + description?: string; +} + +export interface GuildInfo { + permissionRoles: string[]; + roles: RolesField[]; + streamers: string[]; +} + +export interface CachedGuildInfo { + id: string; + info: GuildInfo; +} + +export interface DatabaseGuildInfo { + id: string; + permissionRoles: string; + roles: string; + streamers: string; +} + +/** + * A helper to help interact with the settings database + */ +export default class SettingsDB extends DatabaseHelper { + #cache: CachedGuildInfo[] = []; + + constructor(file: string) { + super(file); + this.initDatabase().catch(console.error); + } + + /** + * Gets a server's configuration from the database + * @param id The Guild ID to identify the rows + * @returns A promise of a ServerInfo interface containing all of the row's data + */ + public getGuild(id: string): Promise { + return new Promise(async (resolve, reject) => { + const i: number = this.#cache.findIndex( + (info: CachedGuildInfo) => info.id === id + ); + + if (i !== -1) { + resolve(this.#cache[i].info); + return; + } + + try { + const rows: DatabaseGuildInfo[] = await this.select( + 'server', + ['*'], + `id = ${id}` + ); + let row: DatabaseGuildInfo; + if (rows.length === 0) + row = { + id, + permissionRoles: '[]', + roles: '[]', + streamers: '[]', + }; + else row = rows[0]; + const serverInfo: GuildInfo = { + permissionRoles: JSON.parse(row.permissionRoles), + roles: JSON.parse(row.roles), + streamers: JSON.parse(row.streamers), + }; + this.#cache.push({ id, info: serverInfo }); + resolve(serverInfo); + } catch (e: unknown) { + reject(e); + } + }); + } + + /** + * Updates data in the database. The row to be updated is chosen from the ID in the data object. + * Creates a new row if no row with the provided id exists + * @param id The server ID to update the server info + * @param data A ServerInfo object containing the data to be written. + * @returns A void promise, for error handling only + */ + public updateGuild(id: string, data: GuildInfo): Promise { + const i: number = this.#cache.findIndex( + (value: CachedGuildInfo) => value.id === id + ); + if (i !== -1) { + this.#cache[i].info = data; + } else { + this.#cache.push({ id, info: data }); + } + const mappedData: DatabaseGuildInfo = { + id, + permissionRoles: JSON.stringify(data.permissionRoles), + roles: JSON.stringify(data.roles), + streamers: JSON.stringify(data.streamers), + }; + + return this.insertOrUpdate('server', mappedData); + } + + /** + * Creates all required tables if they don't exist. + * @returns A void promise, for error handling only + */ + private initDatabase(): Promise { + return this.createTable('server', [ + 'id VARCHAR(25) NOT NULL PRIMARY KEY', + 'permissionRoles TEXT', + 'roles TEXT', + 'streamers TEXT', + ]); + } +} diff --git a/src/twitch/CreateEmbed.ts b/src/twitch/CreateEmbed.ts index bdbf3b3..f1355f1 100644 --- a/src/twitch/CreateEmbed.ts +++ b/src/twitch/CreateEmbed.ts @@ -66,7 +66,7 @@ export default class CreateEmbed { * Sends the embed into #live */ async sendEmbed(): Promise { - for (const guild of DiscordClient._client.guilds.cache.toJSON()) { + for (const guild of DiscordClient._safeGuilds) { const liveChannel: GuildTextChannel | undefined = guild.channels.cache.find( (channel: GuildBasedChannel): boolean => diff --git a/src/twitch/DMManager.ts b/src/twitch/DMManager.ts index 85dc483..f16e740 100644 --- a/src/twitch/DMManager.ts +++ b/src/twitch/DMManager.ts @@ -35,12 +35,15 @@ export default class DMManager { static validNameRegex: RegExp = /^[a-zA-Z0-9_\-]+$/; constructor() { - this.#twitchHelper.update((): string[] => - Settings.settings['streamer-subscriptions'] - .map((channel: Channel): string => channel.streamer) - .filter( - (streamer: string): boolean => - !!streamer.match(DMManager.validNameRegex) + this.#twitchHelper.update( + (): Promise => + Promise.resolve( + Settings.settings['streamer-subscriptions'] + .map((channel: Channel): string => channel.streamer) + .filter( + (streamer: string): boolean => + !!streamer.match(DMManager.validNameRegex) + ) ) ); } diff --git a/src/twitch/LiveChannel.ts b/src/twitch/LiveChannel.ts index 6e5c5f7..caeedad 100644 --- a/src/twitch/LiveChannel.ts +++ b/src/twitch/LiveChannel.ts @@ -1,14 +1,19 @@ import TwitchHelper, { Stream } from './TwitchHelper'; import CreateEmbed from './CreateEmbed'; import Settings from '../Settings'; +import GuildSettings from '../settings/GuildSettings'; /** * Handles the #live channel */ export default class LiveChannel { - constructor() { + #guildId: string; + + constructor(guildId: string) { + this.#guildId = guildId; new TwitchHelper(this.streamerFetch.bind(this)).update( - (): string[] => Settings.settings.streamers + async (): Promise => + (await GuildSettings.settings(guildId)).streamers ); } @@ -17,6 +22,14 @@ export default class LiveChannel { * @param streams Currently live streams */ private async streamerFetch(streams: Stream[]): Promise { + const streamers = (await GuildSettings.settings(this.#guildId)).streamers; + streams.sort((a: Stream, b: Stream): number => { + for (const streamer of streamers) { + if (a.user_name === streamer) return -1; + if (b.user_name === streamer) return 1; + } + return 0; + }); const createEmbed: CreateEmbed = new CreateEmbed(); for (const stream of streams.slice(0, 5)) createEmbed.addField({ diff --git a/src/twitch/TwitchHelper.ts b/src/twitch/TwitchHelper.ts index 739aff2..b55c10f 100644 --- a/src/twitch/TwitchHelper.ts +++ b/src/twitch/TwitchHelper.ts @@ -25,7 +25,7 @@ export interface StreamData { export default class TwitchHelper { /** The access token for the Twitch API */ #accessToken?: string; - #streamerUpdate: () => string[] = () => []; + #streamerUpdate: () => Promise = () => Promise.resolve([]); #streamerUpdateSplit: string[][] = []; #callback: (streams: Stream[]) => Promise; @@ -47,9 +47,9 @@ export default class TwitchHelper { * Fetches the current state of streams * @param streamerUpdate Function to execute to obtain the streamers to fetch */ - async update(streamerUpdate?: () => string[]): Promise { + async update(streamerUpdate?: () => Promise): Promise { if (streamerUpdate !== undefined) this.#streamerUpdate = streamerUpdate; - const streamers: string[] = this.#streamerUpdate(); + const streamers: string[] = await this.#streamerUpdate(); if (streamers.length === 0) { this.timeout(); return; @@ -95,14 +95,6 @@ export default class TwitchHelper { } } - streams.sort((a: Stream, b: Stream): number => { - for (const streamer of Settings.settings.streamers) { - if (a.user_name === streamer) return -1; - if (b.user_name === streamer) return 1; - } - return 0; - }); - this.#callback(streams) .then(this.timeout.bind(this)) .catch((reason: any): void => { diff --git a/yarn.lock b/yarn.lock index 10c4761..43339fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,6 +62,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@gar/promisify@^1.0.1": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" @@ -76,6 +81,21 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@mapbox/node-pre-gyp@^1.0.0": + version "1.0.10" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz#8e6735ccebbb1581e5a7e652244cadc8a844d03c" + integrity sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA== + dependencies: + detect-libc "^2.0.0" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.7" + nopt "^5.0.0" + npmlog "^5.0.1" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.11" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -97,6 +117,22 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@npmcli/fs@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257" + integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + +"@npmcli/move-file@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@sapphire/async-queue@^1.3.1": version "1.3.1" resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.3.1.tgz#9d861e626dbffae02d808e13f823d4510e450a78" @@ -112,6 +148,11 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + "@types/body-parser@*": version "1.19.2" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" @@ -274,6 +315,11 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -292,6 +338,30 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +agent-base@6, agent-base@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +agentkeepalive@^4.1.3: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -343,6 +413,27 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -418,6 +509,30 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== +cacache@^15.2.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== + dependencies: + "@npmcli/fs" "^1.0.0" + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.0.2" + unique-filename "^1.1.1" + call-bind@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -467,6 +582,16 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" @@ -503,6 +628,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.2, color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -515,6 +645,11 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +console-control-strings@^1.0.0, console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + content-disposition@0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" @@ -553,7 +688,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -583,16 +718,31 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + depd@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +depd@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + destroy@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -652,6 +802,13 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encoding@^0.1.12: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -659,6 +816,16 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -1021,6 +1188,13 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1036,6 +1210,35 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" + integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + object-assign "^4.1.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + get-intrinsic@^1.0.2: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" @@ -1057,7 +1260,7 @@ glob-parent@^5.1.2: dependencies: is-glob "^4.0.1" -glob@^7.1.3: +glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -1088,6 +1291,11 @@ globby@^11.0.3: merge2 "^1.4.1" slash "^3.0.0" +graceful-fs@^4.2.6: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + gts@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/gts/-/gts-3.1.1.tgz#c7347cf8f8ea32577909659b22bf698ac5ca8082" @@ -1129,6 +1337,11 @@ has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1148,6 +1361,11 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" +http-cache-semantics@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -1159,11 +1377,35 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +https-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -1171,6 +1413,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -1199,6 +1448,11 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== +infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1207,7 +1461,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1231,6 +1485,11 @@ inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -1265,6 +1524,11 @@ is-glob@^4.0.0, is-glob@^4.0.1: dependencies: is-extglob "^2.1.1" +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1375,6 +1639,35 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-fetch-happen@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" + integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== + dependencies: + agentkeepalive "^4.1.3" + cacache "^15.2.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.2" + promise-retry "^2.0.1" + socks-proxy-agent "^6.0.0" + ssri "^8.0.0" + map-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" @@ -1479,6 +1772,65 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^1.3.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" + integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minizlib@^2.0.0, minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -1489,7 +1841,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3: +ms@2.1.3, ms@^2.0.0: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -1509,18 +1861,46 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -negotiator@0.6.3: +negotiator@0.6.3, negotiator@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -node-fetch@^2.6.1: +node-addon-api@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + +node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" +node-gyp@8.x: + version "8.4.1" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" + integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^9.1.0" + nopt "^5.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -1548,6 +1928,31 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" + +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" @@ -1605,6 +2010,13 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -1689,6 +2101,19 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -1753,6 +2178,15 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -1793,6 +2227,11 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -1824,12 +2263,12 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -safe-buffer@5.2.1: +safe-buffer@5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3": +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -1839,7 +2278,7 @@ safe-buffer@5.2.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.1.0: +semver@^6.0.0, semver@^6.1.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -1880,6 +2319,11 @@ serve-static@1.15.0: parseurl "~1.3.3" send "0.18.0" +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -1906,7 +2350,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -1925,6 +2369,28 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +smart-buffer@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +socks-proxy-agent@^6.0.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" + integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + +socks@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" @@ -1956,12 +2422,30 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +sqlite3@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.2.tgz#f50d5b1482b6972fb650daf6f718e6507c6cfb0f" + integrity sha512-D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg== + dependencies: + "@mapbox/node-pre-gyp" "^1.0.0" + node-addon-api "^4.2.0" + tar "^6.1.11" + optionalDependencies: + node-gyp "8.x" + +ssri@^8.0.0, ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + dependencies: + minipass "^3.1.1" + statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -string-width@^4.1.0, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1970,6 +2454,13 @@ string-width@^4.1.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -2024,6 +2515,18 @@ table@^6.0.9: string-width "^4.2.3" strip-ansi "^6.0.1" +tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: + version "6.1.12" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" + integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -2137,6 +2640,20 @@ typescript@^4.5.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== +unique-filename@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -2149,6 +2666,11 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" +util-deprecate@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -2185,13 +2707,20 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" +wide-align@^1.1.2, wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"