Merge pull request #9 from peterlewis/lint-fixes

Lint fixes
2023-02-01 11:35:13 +00:00 · 2023-02-01 11:35:13 +00:00 · a4e5b18967
parent ee60e15ea1 fb3ece4360
commit a4e5b18967
7 changed files with 35 additions and 35 deletions
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -3,7 +3,7 @@ name: Lint
 on:
  push:
    branches:
-      - master
+      - development
      - production
  pull_request:

--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@ -35,7 +35,7 @@ module.exports = class Server {
      })))

      // Authentication
-      .get('/api/session', Util.promisify(async req => {
+      .get('/api/session', Util.promisify(async (req) => {
        const requiresPassword = !!process.env.PASSWORD;
        const authenticated = requiresPassword
          ? !!(req.session && req.session.authenticated)
@ -46,7 +46,7 @@ module.exports = class Server {
          authenticated,
        };
      }))
-      .post('/api/session', Util.promisify(async req => {
+      .post('/api/session', Util.promisify(async (req) => {
        const {
          password,
        } = req.body;
@ -79,14 +79,14 @@ module.exports = class Server {
          error: 'Not Logged In',
        });
      })
-      .delete('/api/session', Util.promisify(async req => {
+      .delete('/api/session', Util.promisify(async (req) => {
        const sessionId = req.session.id;

        req.session.destroy();

        debug(`Deleted Session: ${sessionId}`);
      }))
-      .get('/api/wireguard/client', Util.promisify(async req => {
+      .get('/api/wireguard/client', Util.promisify(async (req) => {
        return WireGuard.getClients();
      }))
      .get('/api/wireguard/client/:clientId/qrcode.svg', Util.promisify(async (req, res) => {
@ -108,28 +108,28 @@ module.exports = class Server {
        res.header('Content-Type', 'text/plain');
        res.send(config);
      }))
-      .post('/api/wireguard/client', Util.promisify(async req => {
+      .post('/api/wireguard/client', Util.promisify(async (req) => {
        const { name } = req.body;
        return WireGuard.createClient({ name });
      }))
-      .delete('/api/wireguard/client/:clientId', Util.promisify(async req => {
+      .delete('/api/wireguard/client/:clientId', Util.promisify(async (req) => {
        const { clientId } = req.params;
        return WireGuard.deleteClient({ clientId });
      }))
-      .post('/api/wireguard/client/:clientId/enable', Util.promisify(async req => {
+      .post('/api/wireguard/client/:clientId/enable', Util.promisify(async (req) => {
        const { clientId } = req.params;
        return WireGuard.enableClient({ clientId });
      }))
-      .post('/api/wireguard/client/:clientId/disable', Util.promisify(async req => {
+      .post('/api/wireguard/client/:clientId/disable', Util.promisify(async (req) => {
        const { clientId } = req.params;
        return WireGuard.disableClient({ clientId });
      }))
-      .put('/api/wireguard/client/:clientId/name', Util.promisify(async req => {
+      .put('/api/wireguard/client/:clientId/name', Util.promisify(async (req) => {
        const { clientId } = req.params;
        const { name } = req.body;
        return WireGuard.updateClientName({ clientId, name });
      }))
-      .put('/api/wireguard/client/:clientId/address', Util.promisify(async req => {
+      .put('/api/wireguard/client/:clientId/address', Util.promisify(async (req) => {
        const { clientId } = req.params;
        const { address } = req.body;
        return WireGuard.updateClientAddress({ clientId, address });
--- a/src/lib/Util.js
+++ b/src/lib/Util.js
@ -21,7 +21,7 @@ module.exports = class Util {
    // eslint-disable-next-line func-names
    return function(req, res) {
      Promise.resolve().then(async () => fn(req, res))
-        .then(result => {
+        .then((result) => {
          if (res.headersSent) return;

          if (typeof result === 'undefined') {
@ -34,7 +34,7 @@ module.exports = class Util {
            .status(200)
            .json(result);
        })
-        .catch(error => {
+        .catch((error) => {
          if (typeof error === 'string') {
            error = new Error(error);
          }
--- a/src/lib/WireGuard.js
+++ b/src/lib/WireGuard.js
@ -60,7 +60,7 @@ module.exports = class WireGuard {

        await this.__saveConfig(config);
        await Util.exec('wg-quick down wg0').catch(() => { });
-        await Util.exec('wg-quick up wg0').catch(err => {
+        await Util.exec('wg-quick up wg0').catch((err) => {
          if (err && err.message && err.message.includes('Cannot find device "wg0"')) {
            throw new Error('WireGuard exited with the error: Cannot find device "wg0"\nThis usually means that your host\'s kernel does not support WireGuard!');
          }
@ -156,7 +156,7 @@ AllowedIPs = ${client.address}/32`;
      .trim()
      .split('\n')
      .slice(1)
-      .forEach(line => {
+      .forEach((line) => {
        const [
          publicKey,
          preSharedKey, // eslint-disable-line no-unused-vars
@ -168,7 +168,7 @@ AllowedIPs = ${client.address}/32`;
          persistentKeepalive,
        ] = line.split('\t');

-        const client = clients.find(client => client.publicKey === publicKey);
+        const client = clients.find((client) => client.publicKey === publicKey);
        if (!client) return;

        client.latestHandshakeAt = latestHandshakeAt === '0'
@ -233,7 +233,7 @@ Endpoint = ${WG_HOST}:${WG_PORT}`;
    // Calculate next IP
    let address;
    for (let i = 2; i < 255; i++) {
-      const client = Object.values(config.clients).find(client => {
+      const client = Object.values(config.clients).find((client) => {
        return client.address === WG_DEFAULT_ADDRESS.replace('x', i);
      });

--- a/src/server.js
+++ b/src/server.js
@ -5,7 +5,7 @@ require('./services/Server');
 const WireGuard = require('./services/WireGuard');

 WireGuard.getConfig()
-  .catch(err => {
+  .catch((err) => {
  // eslint-disable-next-line no-console
    console.error(err);

--- a/src/www/js/api.js
+++ b/src/www/js/api.js
@ -62,7 +62,7 @@ class API {
    return this.call({
      method: 'get',
      path: '/wireguard/client',
-    }).then(clients => clients.map(client => ({
+    }).then((clients) => clients.map((client) => ({
      ...client,
      createdAt: new Date(client.createdAt),
      updatedAt: new Date(client.updatedAt),
--- a/src/www/js/app.js
+++ b/src/www/js/app.js
@ -112,7 +112,7 @@ new Vue({
    },
  },
  methods: {
-    dateTime: value => {
+    dateTime: (value) => {
      return new Intl.DateTimeFormat(undefined, {
        year: 'numeric',
        month: 'short',
@ -127,7 +127,7 @@ new Vue({
      if (!this.authenticated) return;

      const clients = await this.api.getClients();
-      this.clients = clients.map(client => {
+      this.clients = clients.map((client) => {
        if (client.name.includes('@') && client.name.includes('.')) {
          client.avatar = `https://www.gravatar.com/avatar/${md5(client.name)}?d=blank`;
        }
@ -186,7 +186,7 @@ new Vue({
          this.requiresPassword = session.requiresPassword;
          return this.refresh();
        })
-        .catch(err => {
+        .catch((err) => {
          alert(err.message || err.toString());
        })
        .finally(() => {
@ -202,7 +202,7 @@ new Vue({
          this.authenticated = false;
          this.clients = null;
        })
-        .catch(err => {
+        .catch((err) => {
          alert(err.message || err.toString());
        });
    },
@ -211,54 +211,54 @@ new Vue({
      if (!name) return;

      this.api.createClient({ name })
-        .catch(err => alert(err.message || err.toString()))
+        .catch((err) => alert(err.message || err.toString()))
        .finally(() => this.refresh().catch(console.error));
    },
    deleteClient(client) {
      this.api.deleteClient({ clientId: client.id })
-        .catch(err => alert(err.message || err.toString()))
+        .catch((err) => alert(err.message || err.toString()))
        .finally(() => this.refresh().catch(console.error));
    },
    enableClient(client) {
      this.api.enableClient({ clientId: client.id })
-        .catch(err => alert(err.message || err.toString()))
+        .catch((err) => alert(err.message || err.toString()))
        .finally(() => this.refresh().catch(console.error));
    },
    disableClient(client) {
      this.api.disableClient({ clientId: client.id })
-        .catch(err => alert(err.message || err.toString()))
+        .catch((err) => alert(err.message || err.toString()))
        .finally(() => this.refresh().catch(console.error));
    },
    updateClientName(client, name) {
      this.api.updateClientName({ clientId: client.id, name })
-        .catch(err => alert(err.message || err.toString()))
+        .catch((err) => alert(err.message || err.toString()))
        .finally(() => this.refresh().catch(console.error));
    },
    updateClientAddress(client, address) {
      this.api.updateClientAddress({ clientId: client.id, address })
-        .catch(err => alert(err.message || err.toString()))
+        .catch((err) => alert(err.message || err.toString()))
        .finally(() => this.refresh().catch(console.error));
    },
  },
  filters: {
    bytes,
-    timeago: value => {
+    timeago: (value) => {
      return timeago().format(value);
    },
  },
  mounted() {
    this.api = new API();
    this.api.getSession()
-      .then(session => {
+      .then((session) => {
        this.authenticated = session.authenticated;
        this.requiresPassword = session.requiresPassword;
        this.refresh({
          updateCharts: true,
-        }).catch(err => {
+        }).catch((err) => {
          alert(err.message || err.toString());
        });
      })
-      .catch(err => {
+      .catch((err) => {
        alert(err.message || err.toString());
      });

@ -271,8 +271,8 @@ new Vue({
    Promise.resolve().then(async () => {
      const currentRelease = await this.api.getRelease();
      const latestRelease = await fetch('https://weejewel.github.io/wg-easy/changelog.json')
-        .then(res => res.json())
-        .then(releases => {
+        .then((res) => res.json())
+        .then((releases) => {
          const releasesArray = Object.entries(releases).map(([version, changelog]) => ({
            version: parseInt(version, 10),
            changelog,