chore(deps): update dependency standard to v14 (#147)

Author: renovate[bot]

app.js

@@ -17,7 +17,8 @@ module.exports = async (dbPool, logger, serversPool) => {
   const router = new Router()
 
   const sessionConfig =
-    { key: process.env.SESSION_NAME,
+    {
+      key: process.env.SESSION_NAME,
       renew: true,
       httpOnly: true,
       decode (str) {
@@ -35,7 +36,7 @@ module.exports = async (dbPool, logger, serversPool) => {
       }
     }
 
-  app.keys = [ process.env.SESSION_KEY ]
+  app.keys = [process.env.SESSION_KEY]
 
   app.use(async (ctx, next) => {
     try {
@@ -83,7 +84,7 @@ module.exports = async (dbPool, logger, serversPool) => {
 
         return { message: 'Internal Server Error' }
       },
-      validationRules: [ depthLimit(10) ]
+      validationRules: [depthLimit(10)]
     }
   }
 

cli/commands/encrypt.js

@@ -9,7 +9,7 @@ exports.builder = { value: { type: 'string' } }
 
 // eslint-disable-next-line max-statements
 exports.handler = async function () {
-  const { value } = await inquirer.prompt([ { type: 'password', name: 'value', message: 'Value' } ])
+  const { value } = await inquirer.prompt([{ type: 'password', name: 'value', message: 'Value' }])
   const encValue = await crypto.encrypt(process.env.ENCRYPTION_KEY, value)
 
   console.log(`Encrypted Value: ${encValue}`)

cli/commands/setup.js

@@ -20,10 +20,11 @@ exports.handler = async function () {
   console.log('Starting setup')
   console.log('If unsure, use default')
   const { siteHost, port, sessionName, sessionDomain, contactEmail } = await inquirer.prompt(
-    [ { type: 'input', name: 'siteHost', message: 'BanManager UI Site Hostname', default: 'http://localhost:3000' },
+    [{ type: 'input', name: 'siteHost', message: 'BanManager UI Site Hostname', default: 'http://localhost:3000' },
       { type: 'input', name: 'port', message: 'Port to run API', default: 3001 },
       { type: 'input', name: 'sessionName', message: 'Cookie session name', default: 'bm-ui-sess' },
-      { type: 'input',
+      {
+        type: 'input',
         name: 'sessionDomain',
         message: 'Top level cookie session domain e.g. frostcast.net',
         default: 'localhost'
@@ -34,7 +35,7 @@ exports.handler = async function () {
   const sessionKey = await crypto.createKey().toString('hex')
   const { publicKey, privateKey } = generateVAPIDKeys()
   const dbQuestions =
-    [ { type: 'input', name: 'host', message: 'Database Host', default: '127.0.0.1' },
+    [{ type: 'input', name: 'host', message: 'Database Host', default: '127.0.0.1' },
       { type: 'input', name: 'port', message: 'Database Port', default: 3306 },
       { type: 'input', name: 'user', message: 'Database User' },
       { type: 'password', name: 'password', message: 'Database Password' },
@@ -47,7 +48,8 @@ exports.handler = async function () {
   console.log('Setting up database...')
 
   const dbConfig =
-    { ...dbAnswers,
+    {
+      ...dbAnswers,
       driver: 'mysql',
       connectionLimit: 1,
       multipleStatements: true
@@ -90,15 +92,15 @@ exports.handler = async function () {
 
   console.log('Setup your admin user')
 
-  const { email } = await inquirer.prompt([ { name: 'email', message: 'Your email address' } ])
+  const { email } = await inquirer.prompt([{ name: 'email', message: 'Your email address' }])
   const password = await askPassword()
   const playerId = await askPlayerAccount('Your Minecraft Player UUID', conn, serverConn, serverTables.players)
   const user = {
-    email, password, 'player_id': playerId, updated: Math.floor(Date.now() / 1000)
+    email, password, player_id: playerId, updated: Math.floor(Date.now() / 1000)
   }
 
   await udify.insert(conn, 'bm_web_users', user)
-  await udify.insert(conn, 'bm_web_player_roles', { 'player_id': playerId, 'role_id': 3 })
+  await udify.insert(conn, 'bm_web_player_roles', { player_id: playerId, role_id: 3 })
 
   console.log(`Account created, start the application and login via ${siteHost}/login`)
 
@@ -143,7 +145,7 @@ DB_CONNECTION_LIMIT=5
 
 async function askPassword () {
   const { password, vPass } = await inquirer.prompt(
-    [ { type: 'password', name: 'password', message: 'Password' },
+    [{ type: 'password', name: 'password', message: 'Password' },
       { type: 'password', name: 'vPass', message: 'Confirm Password' }
     ])
 
@@ -169,7 +171,8 @@ async function promptServerDetails () {
 
   try {
     db =
-      { host,
+      {
+        host,
         port,
         user,
         password,
@@ -186,7 +189,7 @@ async function promptServerDetails () {
 
   const serverTables = {}
 
-  for (let table of tables) {
+  for (const table of tables) {
     const tableName = await promptTable(conn, table)
 
     serverTables[table] = tableName
@@ -196,7 +199,7 @@ async function promptServerDetails () {
 }
 
 async function promptTable (conn, table) {
-  const { tableName } = await inquirer.prompt([ { name: 'tableName', message: `${table} table name` } ])
+  const { tableName } = await inquirer.prompt([{ name: 'tableName', message: `${table} table name` }])
 
   try {
     await checkTable(conn, tableName)
@@ -211,9 +214,9 @@ async function promptTable (conn, table) {
 }
 
 async function checkTable (conn, table) {
-  const [ [ { exists } ] ] = await conn.execute(
+  const [[{ exists }]] = await conn.execute(
     'SELECT COUNT(*) AS `exists` FROM information_schema.tables WHERE table_schema = ? AND table_name = ?'
-    , [ conn.connection.config.database, table ])
+    , [conn.connection.config.database, table])
 
   if (!exists) {
     throw new Error('Could not find table ' + table)
@@ -222,13 +225,13 @@ async function checkTable (conn, table) {
 
 // { type: 'input', name: 'name', message: 'Server Name', default: 'Frostcast' }
 async function askPlayer (question, conn, table) {
-  const questions = [ { name: 'id', message: question } ]
+  const questions = [{ name: 'id', message: question }]
   const { id } = await inquirer.prompt(questions)
   const parsedId = parse(id, Buffer.alloc(16))
 
-  const [ [ result ] ] = await conn.query(
+  const [[result]] = await conn.query(
     'SELECT name FROM ?? WHERE id = ?'
-    , [ table, parsedId ])
+    , [table, parsedId])
 
   if (!result) {
     console.log(`Could not find Player ${id}`)
@@ -243,9 +246,9 @@ async function askPlayer (question, conn, table) {
 async function askPlayerAccount (question, conn, serverConn, table) {
   const id = await askPlayer(question, serverConn, table)
 
-  const [ [ { exists } ] ] = await conn.execute(
+  const [[{ exists }]] = await conn.execute(
     'SELECT COUNT(*) AS `exists` FROM bm_web_users WHERE player_id = ?'
-    , [ id ])
+    , [id])
 
   if (exists) {
     console.error('An account already exists for that player')

data/connections/servers-pool.js

@@ -3,7 +3,7 @@ const setupPool = require('./setup-db-pool')
 const { decrypt } = require('../crypto')
 
 async function interval (servers, dbPool, logger) {
-  const [ rows ] = await dbPool.query('SELECT * FROM bm_web_servers')
+  const [rows] = await dbPool.query('SELECT * FROM bm_web_servers')
   const newIds = await Promise.all(rows.map(async (server) => {
     server.tables = JSON.parse(server.tables)
 
@@ -25,7 +25,8 @@ async function interval (servers, dbPool, logger) {
     }
 
     const poolConfig =
-      { connectionLimit: 5,
+      {
+        connectionLimit: 5,
         host: server.host,
         port: server.port,
         user: server.user,
@@ -34,7 +35,8 @@ async function interval (servers, dbPool, logger) {
       }
     const pool = setupPool(poolConfig, logger)
     const serverDetails =
-      { config: server,
+      {
+        config: server,
         pool,
         execute: pool.execute.bind(pool),
         query: pool.query.bind(pool)

data/loaders/player-loader.js

@@ -12,9 +12,9 @@ module.exports = (ctx) => {
 
     await Promise.all(Array.from(ctx.state.serversPool.values())).each(async server => {
       const table = server.config.tables.players
-      const [ rows ] = await server.query('SELECT * FROM ?? WHERE id IN(?)', [ table, parsedIds ])
+      const [rows] = await server.query('SELECT * FROM ?? WHERE id IN(?)', [table, parsedIds])
 
-      for (let player of rows) {
+      for (const player of rows) {
         const playerId = unparse(player.id)
         let cachedPlayer = players[playerId]
 
@@ -35,13 +35,14 @@ module.exports = (ctx) => {
         }
 
         const now = Math.floor(Date.now() / 1000)
-        const [ [ { mysqlTime } ] ] = await server.execute(`SELECT (${now} - UNIX_TIMESTAMP()) AS mysqlTime`)
+        const [[{ mysqlTime }]] = await server.execute(`SELECT (${now} - UNIX_TIMESTAMP()) AS mysqlTime`)
         const offset = mysqlTime > 0 ? Math.floor(mysqlTime) : Math.ceil(mysqlTime)
         const timeOffset = offset * 1000
         const serverData = { ...server.config, timeOffset }
 
         cachedPlayer.servers.push(
-          { id: server.config.id,
+          {
+            id: server.config.id,
             ip: player.ip,
             lastSeen: player.lastSeen,
             server: serverData,

data/loaders/player-punishment-loader.js

@@ -15,25 +15,26 @@ module.exports = ({ state }, tableName, resource) => {
 
     playerIds = uniq(playerIds)
 
-    for (let serverId of serverIds) {
+    for (const serverId of serverIds) {
       const server = serversPool.get(serverId)
       const table = server.config.tables[tableName]
 
-      let [ rows ] = await server.query('SELECT * FROM ?? WHERE player_id IN(?)', [ table, playerIds ])
+      let [rows] = await server.query('SELECT * FROM ?? WHERE player_id IN(?)', [table, playerIds])
 
       rows = await Promise.map(rows, async row => {
         const actor = await state.loaders.player.ids.load(row.actor_id)
         const acl =
-          { update: state.acl.hasServerPermission(serverId, resource, 'update.any') ||
+          {
+            update: state.acl.hasServerPermission(serverId, resource, 'update.any') ||
             (state.acl.hasServerPermission(serverId, resource, 'update.own') && state.acl.owns(row.actor_id)) ||
             (state.acl.hasServerPermission(serverId, resource, 'update.any')) ||
             (state.acl.hasServerPermission(serverId, resource, 'update.own') && state.acl.owns(row.actor_id)),
-          delete: state.acl.hasServerPermission(serverId, resource, 'delete.any') ||
+            delete: state.acl.hasServerPermission(serverId, resource, 'delete.any') ||
             (state.acl.hasServerPermission(serverId, resource, 'delete.own') && state.acl.owns(row.actor_id)) ||
             (state.acl.hasServerPermission(serverId, resource, 'delete.any')) ||
             (state.acl.hasServerPermission(serverId, resource, 'delete.own') && state.acl.owns(row.actor_id)),
-          actor: state.acl.owns(row.actor_id),
-          yours: state.acl.owns(row.player_id)
+            actor: state.acl.owns(row.actor_id),
+            yours: state.acl.owns(row.player_id)
           }
 
         return { actor, acl, ...row }
@@ -57,22 +58,23 @@ module.exports = ({ state }, tableName, resource) => {
 
     punishmentIds = uniq(punishmentIds)
 
-    for (let serverId of serverIds) {
+    for (const serverId of serverIds) {
       const server = serversPool.get(serverId)
       const table = server.config.tables[tableName]
 
-      let [ rows ] = await server.query('SELECT * FROM ?? WHERE id IN(?)', [ table, punishmentIds ])
+      let [rows] = await server.query('SELECT * FROM ?? WHERE id IN(?)', [table, punishmentIds])
 
       rows = await Promise.map(rows, async row => {
         const actor = await state.loaders.player.ids.load(row.actor_id)
         const player = await state.loaders.player.ids.load(row.player_id)
         const acl =
-          { update: state.acl.hasServerPermission(serverId, resource, 'update.any') ||
+          {
+            update: state.acl.hasServerPermission(serverId, resource, 'update.any') ||
             (state.acl.hasServerPermission(serverId, resource, 'update.own') && state.acl.owns(row.actor_id)),
-          delete: state.acl.hasServerPermission(serverId, resource, 'delete.any') ||
+            delete: state.acl.hasServerPermission(serverId, resource, 'delete.any') ||
             (state.acl.hasServerPermission(serverId, resource, 'delete.own') && state.acl.owns(row.actor_id)),
-          actor: state.acl.owns(row.actor_id),
-          yours: state.acl.owns(row.player_id)
+            actor: state.acl.owns(row.actor_id),
+            yours: state.acl.owns(row.player_id)
           }
 
         return { player, actor, acl, ...row }

data/loaders/report-comment-loader.js

@@ -16,7 +16,7 @@ module.exports = ({ state }) => {
             LEFT JOIN
           ${tables.players} a ON c.actor_id = a.id
         WHERE c.id = ?`
-      const [ [ result ] ] = await server.execute(query, [ id ])
+      const [[result]] = await server.execute(query, [id])
 
       if (!result) return null
 

data/loaders/report-loader.js

@@ -33,7 +33,7 @@ module.exports = ({ state }) => {
         ${tables.players} ap ON r.assignee_id = ap.id
       WHERE r.id = ?`
 
-      const [ [ result ] ] = await server.execute(query, [ id ])
+      const [[result]] = await server.execute(query, [id])
 
       if (!result) return null
 

data/loaders/role-loader.js

@@ -3,12 +3,12 @@ const DataLoader = require('dataloader')
 module.exports = ({ state }) => {
   const ids = new DataLoader(async roleIds => {
     return Promise.map(roleIds, async id => {
-      const [ [ role ] ] = await state.dbPool.execute('SELECT role_id AS id, name, parent_role_id AS parent FROM bm_web_roles WHERE role_id = ?', [ id ])
+      const [[role]] = await state.dbPool.execute('SELECT role_id AS id, name, parent_role_id AS parent FROM bm_web_roles WHERE role_id = ?', [id])
 
       if (!role) return null
 
-      const [ resources ] = await state.dbPool.execute('SELECT resource_id AS id, name FROM bm_web_resources')
-      const [ permissions ] = await state.dbPool.execute(`
+      const [resources] = await state.dbPool.execute('SELECT resource_id AS id, name FROM bm_web_resources')
+      const [permissions] = await state.dbPool.execute(`
         SELECT
           rp.permission_id,
           rp.resource_id,
@@ -20,15 +20,16 @@ module.exports = ({ state }) => {
           bm_web_role_resources wrr ON wrr.resource_id = rp.resource_id
         WHERE
           wrr.role_id = ?
-      `, [ id ])
+      `, [id])
 
       resources.forEach(resource => {
         const perms = permissions.filter(perm => perm.resource_id === resource.id)
 
         if (!perms) resource.permissions = []
 
         resource.permissions = perms.map(perm => (
-          { id: perm.permission_id,
+          {
+            id: perm.permission_id,
             name: perm.name,
             allowed: perm.allowed
           }