18 files changed, 210 insertions, 210 deletions

diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 1a7595a9d..d44839db1 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -1,22 +1,18 @@
 const Recipe = use('App/Models/Recipe');
 const Drive = use('Drive');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 const Env = use('Env');
 
 const fetch = require('node-fetch');
 const debug = require('debug')('Ferdi:internalServer:RecipeController');
 const { LIVE_FERDI_API } = require('../../../../config');
-const { API_VERSION } = require('../../../../environment');
+const { API_VERSION } = require('../../../../environment-remote');
 
 const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
 
 class RecipeController {
   // List official and custom recipes
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const officialRecipes = JSON.parse(await (await fetch(RECIPES_URL)).text());
     const customRecipesArray = (await Recipe.all()).rows;
     const customRecipes = customRecipesArray.map(recipe => ({
@@ -25,19 +21,13 @@ class RecipeController {
       ...JSON.parse(recipe.data),
     }));
 
-    const recipes = [
-      ...officialRecipes,
-      ...customRecipes,
-    ];
+    const recipes = [...officialRecipes, ...customRecipes];
 
     return response.send(recipes);
   }
 
   // Search official and custom recipes
-  async search({
-    request,
-    response,
-  }) {
+  async search({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       needle: 'required',
@@ -64,13 +54,23 @@ class RecipeController {
       }));
     } else {
       let remoteResults = [];
-      if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
-        remoteResults = JSON.parse(await (await fetch(`${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`)).text());
+      // eslint-disable-next-line eqeqeq
+      if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
+        // eslint-disable-line eqeqeq
+        remoteResults = JSON.parse(
+          await (
+            await fetch(
+              `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`,
+            )
+          ).text(),
+        );
       }
 
       debug('remoteResults:', remoteResults);
 
-      const localResultsArray = (await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()).toJSON();
+      const localResultsArray = (
+        await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch()
+      ).toJSON();
       const localResults = localResultsArray.map(recipe => ({
         id: recipe.recipeId,
         name: recipe.name,
@@ -79,20 +79,14 @@ class RecipeController {
 
       debug('localResults:', localResults);
 
-      results = [
-        ...localResults,
-        ...remoteResults || [],
-      ];
+      results = [...localResults, ...(remoteResults || [])];
     }
 
     return response.send(results);
   }
 
   // Download a recipe
-  async download({
-    response,
-    params,
-  }) {
+  async download({ response, params }) {
     // Validate user input
     const validation = await validateAll(params, {
       recipe: 'required|accepted',
@@ -108,14 +102,17 @@ class RecipeController {
     const service = params.recipe;
 
     // Check for invalid characters
-    if (/\.{1,}/.test(service) || /\/{1,}/.test(service)) {
+    if (/\.+/.test(service) || /\/+/.test(service)) {
       return response.send('Invalid recipe name');
     }
 
     // Check if recipe exists in recipes folder
     if (await Drive.exists(`${service}.tar.gz`)) {
       return response.send(await Drive.get(`${service}.tar.gz`));
-    } if (Env.get('CONNECT_WITH_FRANZ') == 'true') { // eslint-disable-line eqeqeq
+    }
+    // eslint-disable-next-line eqeqeq
+    if (Env.get('CONNECT_WITH_FRANZ') == 'true') {
+      // eslint-disable-line eqeqeq
       return response.redirect(`${RECIPES_URL}/download/${service}`);
     }
     return response.status(400).send({
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js
index f2af9d411..133473b68 100644
--- a/src/internal-server/app/Controllers/Http/ServiceController.js
+++ b/src/internal-server/app/Controllers/Http/ServiceController.js
@@ -2,7 +2,7 @@ const Service = use('App/Models/Service');
 const { validateAll } = use('Validator');
 const Env = use('Env');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const path = require('path');
 const fs = require('fs-extra');
 const { LOCAL_HOSTNAME, DEFAULT_SERVICE_ORDER } = require('../../../../config');
@@ -135,13 +135,11 @@ class ServiceController {
 
       const newSettings = {
         ...settings,
-        ...{
-          iconId,
-          customIconVersion:
-            settings && settings.customIconVersion
-              ? settings.customIconVersion + 1
-              : 1,
-        },
+        iconId,
+        customIconVersion:
+          settings && settings.customIconVersion
+            ? settings.customIconVersion + 1
+            : 1,
       };
 
       // Update data in database
@@ -157,9 +155,7 @@ class ServiceController {
           id,
           name: service.name,
           ...newSettings,
-          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${
-            newSettings.iconId
-          }`,
+          iconUrl: `http://${hostname}:${port}/${API_VERSION}/icon/${newSettings.iconId}`,
           userId: 1,
         },
         status: ['updated'],
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 994dcc0dc..25b5277bd 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -1,34 +1,35 @@
 const User = use('App/Models/User');
 const Service = use('App/Models/Service');
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
 const btoa = require('btoa');
 const fetch = require('node-fetch');
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 const crypto = require('crypto');
-const { DEFAULT_APP_SETTINGS, API_VERSION } = require('../../../../environment');
+const { DEFAULT_APP_SETTINGS } = require('../../../../config');
+const { API_VERSION } = require('../../../../environment-remote');
 const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
 
-const apiRequest = (url, route, method, auth) => new Promise((resolve, reject) => {
-  try {
-    fetch(`${url}/${API_VERSION}/${route}`, {
-      method,
-      headers: {
-        Authorization: `Bearer ${auth}`,
-        'User-Agent': userAgent(),
-      },
-    })
-      .then(data => data.json())
-      .then(json => resolve(json));
-  } catch (e) {
-    reject();
-  }
-});
+const apiRequest = (url, route, method, auth) =>
+  new Promise((resolve, reject) => {
+    try {
+      fetch(`${url}/${API_VERSION}/${route}`, {
+        method,
+        headers: {
+          Authorization: `Bearer ${auth}`,
+          'User-Agent': userAgent(),
+        },
+      })
+        .then(data => data.json())
+        .then(json => resolve(json));
+    } catch {
+      reject();
+    }
+  });
 
-const LOGIN_SUCCESS_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
+const LOGIN_SUCCESS_TOKEN =
+  'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJGZXJkaSBJbnRlcm5hbCBTZXJ2ZXIiLCJpYXQiOjE1NzEwNDAyMTUsImV4cCI6MjUzMzk1NDE3ODQ0LCJhdWQiOiJnZXRmZXJkaS5jb20iLCJzdWIiOiJmZXJkaUBsb2NhbGhvc3QiLCJ1c2VySWQiOiIxIn0.9_TWFGp6HROv8Yg82Rt6i1-95jqWym40a-HmgrdMC6M';
 
 const DEFAULT_USER_DATA = {
   accountType: 'individual',
@@ -45,10 +46,7 @@ const DEFAULT_USER_DATA = {
 
 class UserController {
   // Register a new user
-  async signup({
-    request,
-    response,
-  }) {
+  async signup({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       firstname: 'required',
@@ -70,10 +68,7 @@ class UserController {
   }
 
   // Login using an existing user
-  async login({
-    request,
-    response,
-  }) {
+  async login({ request, response }) {
     if (!request.header('Authorization')) {
       return response.status(401).send({
         message: 'Please provide authorization',
@@ -88,23 +83,21 @@ class UserController {
   }
 
   // Return information about the current user
-  async me({
-    response,
-  }) {
+  async me({ response }) {
     const user = await User.find(1);
 
-    const settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+    const settings =
+      typeof user.settings === 'string'
+        ? JSON.parse(user.settings)
+        : user.settings;
 
     return response.send({
       ...DEFAULT_USER_DATA,
-      ...settings || {},
+      ...settings,
     });
   }
 
-  async updateMe({
-    request,
-    response,
-  }) {
+  async updateMe({ request, response }) {
     const user = await User.find(1);
 
     let settings = user.settings || {};
@@ -125,16 +118,11 @@ class UserController {
         ...DEFAULT_USER_DATA,
         ...newSettings,
       },
-      status: [
-        'data-updated',
-      ],
+      status: ['data-updated'],
     });
   }
 
-  async import({
-    request,
-    response,
-  }) {
+  async import({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       email: 'required|email',
@@ -142,7 +130,8 @@ class UserController {
       server: 'required',
     });
     if (validation.fails()) {
-      let errorMessage = 'There was an error while trying to import your account:\n';
+      let errorMessage =
+        'There was an error while trying to import your account:\n';
       for (const message of validation.messages()) {
         if (message.validation === 'required') {
           errorMessage += `- Please make sure to supply your ${message.field}\n`;
@@ -155,13 +144,12 @@ class UserController {
       return response.status(401).send(errorMessage);
     }
 
-    const {
-      email,
-      password,
-      server,
-    } = request.all();
+    const { email, password, server } = request.all();
 
-    const hashedPassword = crypto.createHash('sha256').update(password).digest('base64');
+    const hashedPassword = crypto
+      .createHash('sha256')
+      .update(password)
+      .digest('base64');
 
     // Try to get an authentication token
     let token;
@@ -178,16 +166,17 @@ class UserController {
       const content = await rawResponse.json();
 
       if (!content.message || content.message !== 'Successfully logged in') {
-        const errorMessage = 'Could not login into Franz with your supplied credentials. Please check and try again';
+        const errorMessage =
+          'Could not login into Franz with your supplied credentials. Please check and try again';
         return response.status(401).send(errorMessage);
       }
 
       // eslint-disable-next-line prefer-destructuring
       token = content.token;
-    } catch (e) {
+    } catch (error) {
       return response.status(401).send({
         message: 'Cannot login to Franz',
-        error: e,
+        error,
       });
     }
 
@@ -195,12 +184,13 @@ class UserController {
     let userInf = false;
     try {
       userInf = await apiRequest(server, 'me', 'GET', token);
-    } catch (e) {
-      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not get your user info from Franz. Please check your credentials or try again later.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
     if (!userInf) {
-      const errorMessage = 'Could not get your user info from Franz. Please check your credentials or try again later';
+      const errorMessage =
+        'Could not get your user info from Franz. Please check your credentials or try again later';
       return response.status(401).send(errorMessage);
     }
 
@@ -213,8 +203,8 @@ class UserController {
       for (const service of services) {
         await this._createAndCacheService(service, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your services into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
@@ -225,12 +215,14 @@ class UserController {
       for (const workspace of workspaces) {
         await this._createWorkspace(workspace, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
-    return response.send('Your account has been imported. You can now use your Franz account in Ferdi.');
+    return response.send(
+      'Your account has been imported. You can now use your Franz account in Ferdi.',
+    );
   }
 
   // Account import/export
@@ -255,10 +247,7 @@ class UserController {
       .send(exportData);
   }
 
-  async importFerdi({
-    request,
-    response,
-  }) {
+  async importFerdi({ request, response }) {
     const validation = await validateAll(request.all(), {
       file: 'required',
     });
@@ -269,8 +258,10 @@ class UserController {
     let file;
     try {
       file = JSON.parse(request.input('file'));
-    } catch (e) {
-      return response.send('Could not import: Invalid file, could not read file');
+    } catch {
+      return response.send(
+        'Could not import: Invalid file, could not read file',
+      );
     }
 
     if (!file || !file.services || !file.workspaces) {
@@ -284,8 +275,8 @@ class UserController {
       for (const service of file.services) {
         await this._createAndCacheService(service, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your services into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your services into our system.\nError: ${error}`;
       return response.send(errorMessage);
     }
 
@@ -294,8 +285,8 @@ class UserController {
       for (const workspace of file.workspaces) {
         await this._createWorkspace(workspace, serviceIdTranslation); // eslint-disable-line no-await-in-loop
       }
-    } catch (e) {
-      const errorMessage = `Could not import your workspaces into our system.\nError: ${e}`;
+    } catch (error) {
+      const errorMessage = `Could not import your workspaces into our system.\nError: ${error}`;
       return response.status(401).send(errorMessage);
     }
 
@@ -306,15 +297,29 @@ class UserController {
     let newWorkspaceId;
     do {
       newWorkspaceId = uuid();
-    } while ((await Workspace.query().where('workspaceId', newWorkspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
-
-    if (workspace.services && typeof (workspace.services) === 'string' && workspace.services.length > 0) {
+    } while (
+      (await Workspace.query().where('workspaceId', newWorkspaceId).fetch())
+        .rows.length > 0
+    ); // eslint-disable-line no-await-in-loop
+
+    if (
+      workspace.services &&
+      typeof workspace.services === 'string' &&
+      workspace.services.length > 0
+    ) {
       workspace.services = JSON.parse(workspace.services);
     }
-    const services = (workspace.services && typeof (workspace.services) === 'object') ?
-      workspace.services.map(oldServiceId => serviceIdTranslation[oldServiceId]) :
-      [];
-    if (workspace.data && typeof (workspace.data) === 'string' && workspace.data.length > 0) {
+    const services =
+      workspace.services && typeof workspace.services === 'object'
+        ? workspace.services.map(
+            oldServiceId => serviceIdTranslation[oldServiceId],
+          )
+        : [];
+    if (
+      workspace.data &&
+      typeof workspace.data === 'string' &&
+      workspace.data.length > 0
+    ) {
       workspace.data = JSON.parse(workspace.data);
     }
 
@@ -332,12 +337,19 @@ class UserController {
     let newServiceId;
     do {
       newServiceId = uuid();
-    } while ((await Service.query().where('serviceId', newServiceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } while (
+      (await Service.query().where('serviceId', newServiceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
 
     // store the old serviceId as the key for future lookup
     serviceIdTranslation[service.serviceId] = newServiceId;
 
-    if (service.settings && typeof (service.settings) === 'string' && service.settings.length > 0) {
+    if (
+      service.settings &&
+      typeof service.settings === 'string' &&
+      service.settings.length > 0
+    ) {
       service.settings = JSON.parse(service.settings);
     }
 
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js
index 773312a0b..9d461135e 100644
--- a/src/internal-server/app/Controllers/Http/WorkspaceController.js
+++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js
@@ -1,16 +1,11 @@
 const Workspace = use('App/Models/Workspace');
-const {
-  validateAll,
-} = use('Validator');
+const { validateAll } = use('Validator');
 
-const uuid = require('uuid/v4');
+const { v4: uuid } = require('uuid');
 
 class WorkspaceController {
   // Create a new workspace for user
-  async create({
-    request,
-    response,
-  }) {
+  async create({ request, response }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -29,10 +24,13 @@ class WorkspaceController {
     let workspaceId;
     do {
       workspaceId = uuid();
-    } while ((await Workspace.query().where('workspaceId', workspaceId).fetch()).rows.length > 0); // eslint-disable-line no-await-in-loop
+    } while (
+      (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows
+        .length > 0
+    ); // eslint-disable-line no-await-in-loop
 
     const order = (await Workspace.all()).rows.length;
-    const name = data.name;
+    const { name } = data;
     delete data.name;
 
     await Workspace.create({
@@ -52,11 +50,7 @@ class WorkspaceController {
     });
   }
 
-  async edit({
-    request,
-    response,
-    params,
-  }) {
+  async edit({ request, response, params }) {
     // Validate user input
     const validation = await validateAll(request.all(), {
       name: 'required',
@@ -71,20 +65,19 @@ class WorkspaceController {
     }
 
     const data = request.all();
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).update({
-      name: data.name,
-      services: JSON.stringify(data.services),
-    });
+    await Workspace.query()
+      .where('workspaceId', id)
+      .update({
+        name: data.name,
+        services: JSON.stringify(data.services),
+      });
 
     // Get updated row
-    const workspace = (await Workspace.query()
-      .where('workspaceId', id).fetch()).rows[0];
+    const workspace = (await Workspace.query().where('workspaceId', id).fetch())
+      .rows[0];
 
     return response.send({
       id: workspace.workspaceId,
@@ -113,13 +106,10 @@ class WorkspaceController {
       });
     }
 
-    const {
-      id,
-    } = params;
+    const { id } = params;
 
     // Update data in database
-    await (Workspace.query()
-      .where('workspaceId', id)).delete();
+    await Workspace.query().where('workspaceId', id).delete();
 
     return response.send({
       message: 'Successfully deleted workspace',
@@ -127,9 +117,7 @@ class WorkspaceController {
   }
 
   // List all workspaces a user has created
-  async list({
-    response,
-  }) {
+  async list({ response }) {
     const workspaces = (await Workspace.all()).rows;
     // Convert to array with all data Franz wants
     let workspacesArray = [];
@@ -138,7 +126,10 @@ class WorkspaceController {
         id: workspace.workspaceId,
         name: workspace.name,
         order: workspace.order,
-        services: typeof workspace.services === 'string' ? JSON.parse(workspace.services) : workspace.services,
+        services:
+          typeof workspace.services === 'string'
+            ? JSON.parse(workspace.services)
+            : workspace.services,
         userId: 1,
       }));
     }
diff --git a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
index 87f1f6c25..9591cdc41 100644
--- a/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
+++ b/src/internal-server/app/Middleware/ConvertEmptyStringsToNull.js
@@ -1,6 +1,6 @@
 class ConvertEmptyStringsToNull {
   async handle({ request }, next) {
-    if (Object.keys(request.body).length) {
+    if (Object.keys(request.body).length > 0) {
       request.body = Object.assign(
         ...Object.keys(request.body).map(key => ({
           [key]: request.body[key] !== '' ? request.body[key] : null,
diff --git a/src/internal-server/app/Models/Recipe.js b/src/internal-server/app/Models/Recipe.js
index bd9741114..f9370e206 100644
--- a/src/internal-server/app/Models/Recipe.js
+++ b/src/internal-server/app/Models/Recipe.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Recipe extends Model {
-}
+class Recipe extends Model {}
 
 module.exports = Recipe;
diff --git a/src/internal-server/app/Models/Service.js b/src/internal-server/app/Models/Service.js
index a2e5c981e..95321686c 100644
--- a/src/internal-server/app/Models/Service.js
+++ b/src/internal-server/app/Models/Service.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Service extends Model {
-}
+class Service extends Model {}
 
 module.exports = Service;
diff --git a/src/internal-server/app/Models/Token.js b/src/internal-server/app/Models/Token.js
index 83e989117..1388b94ad 100644
--- a/src/internal-server/app/Models/Token.js
+++ b/src/internal-server/app/Models/Token.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Token extends Model {
-}
+class Token extends Model {}
 
 module.exports = Token;
diff --git a/src/internal-server/app/Models/User.js b/src/internal-server/app/Models/User.js
index 907710d8d..f17f04c3e 100644
--- a/src/internal-server/app/Models/User.js
+++ b/src/internal-server/app/Models/User.js
@@ -2,7 +2,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class User extends Model {
-}
+class User extends Model {}
 
 module.exports = User;
diff --git a/src/internal-server/app/Models/Workspace.js b/src/internal-server/app/Models/Workspace.js
index dcf39ac75..c47c02e37 100644
--- a/src/internal-server/app/Models/Workspace.js
+++ b/src/internal-server/app/Models/Workspace.js
@@ -1,7 +1,6 @@
 /** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
 const Model = use('Model');
 
-class Workspace extends Model {
-}
+class Workspace extends Model {}
 
 module.exports = Workspace;
diff --git a/src/internal-server/config/shield.js b/src/internal-server/config/shield.js
index 76f430e91..4ff22c3f9 100644
--- a/src/internal-server/config/shield.js
+++ b/src/internal-server/config/shield.js
@@ -25,8 +25,7 @@ module.exports = {
     | }
     |
     */
-    directives: {
-    },
+    directives: {},
     /*
     |--------------------------------------------------------------------------
     | Report only
diff --git a/src/internal-server/public/js/transfer.js b/src/internal-server/public/js/transfer.js
index 8382bba02..36fdbd61a 100644
--- a/src/internal-server/public/js/transfer.js
+++ b/src/internal-server/public/js/transfer.js
@@ -1,13 +1,17 @@
-const submitBtn = document.getElementById('submit');
-const fileInput = document.getElementById('file');
-const fileOutput = document.getElementById('fileoutput');
+const submitBtn = document.querySelector('#submit');
+const fileInput = document.querySelector('#file');
+const fileOutput = document.querySelector('#fileoutput');
 
-fileInput.addEventListener('change', () => {
+fileInput?.addEventListener('change', () => {
   const reader = new FileReader();
-  reader.onload = () => {
+  reader.addEventListener('load', () => {
     const text = reader.result;
-    fileOutput.value = text;
-    submitBtn.disabled = false;
-  };
+    if (fileOutput) {
+      fileOutput.value = text;
+    }
+    if (submitBtn) {
+      submitBtn.disabled = false;
+    }
+  });
   reader.readAsText(fileInput.files[0]);
 });
diff --git a/src/internal-server/start.js b/src/internal-server/start.ts
index 5ccc1330e..392f7cf41 100644
--- a/src/internal-server/start.js
+++ b/src/internal-server/start.ts
@@ -15,16 +15,16 @@
 |     Make sure to pass a relative path from the project root.
 */
 
-const fold = require('@adonisjs/fold');
-const { Ignitor } = require('@adonisjs/ignitor');
-const fs = require('fs-extra');
-const path = require('path');
-const { LOCAL_HOSTNAME } = require('../config');
-const { isWindows } = require('../environment');
+import fold from '@adonisjs/fold';
+import { Ignitor } from '@adonisjs/ignitor';
+import fs from 'fs-extra';
+import path from 'path';
+import { LOCAL_HOSTNAME } from '../config';
+import { isWindows } from '../environment';
 
 process.env.ENV_PATH = path.join(__dirname, 'env.ini');
 
-module.exports = async (userPath, port) => {
+export const server = async (userPath: string, port: number) => {
   const dbPath = path.join(userPath, 'server.sqlite');
   const dbTemplatePath = path.join(__dirname, 'database', 'template.sqlite');
 
@@ -45,7 +45,7 @@ module.exports = async (userPath, port) => {
   process.env.DB_PATH = dbPath;
   process.env.USER_PATH = userPath;
   process.env.HOST = LOCAL_HOSTNAME;
-  process.env.PORT = port;
+  process.env.PORT = port.toString();
 
-  new Ignitor(fold).appRoot(__dirname).fireHttpServer().catch(console.error); // eslint-disable-line no-console
+  new Ignitor(fold).appRoot(__dirname).fireHttpServer().catch(console.error);
 };
diff --git a/src/internal-server/start/kernel.js b/src/internal-server/start/kernel.js
index 7b540f829..f72e445f2 100644
--- a/src/internal-server/start/kernel.js
+++ b/src/internal-server/start/kernel.js
@@ -32,8 +32,7 @@ const globalMiddleware = [
 | Route.get().middleware('auth')
 |
 */
-const namedMiddleware = {
-};
+const namedMiddleware = {};
 
 /*
 |--------------------------------------------------------------------------
@@ -45,11 +44,8 @@ const namedMiddleware = {
 | control over request lifecycle.
 |
 */
-const serverMiddleware = [
-  'Adonis/Middleware/Static',
-];
+const serverMiddleware = ['Adonis/Middleware/Static'];
 
-Server
-  .registerGlobal(globalMiddleware)
+Server.registerGlobal(globalMiddleware)
   .registerNamed(namedMiddleware)
   .use(serverMiddleware);
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index c27e07bc5..97cefcc54 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -1,4 +1,4 @@
-const { ferdiVersion } = require('../../environment');
+const { ferdiVersion } = require('../../environment-remote');
 
 /**
  * Migrate server database to work with current Ferdi version
@@ -6,29 +6,39 @@ const { ferdiVersion } = require('../../environment');
 const Database = use('Database');
 const User = use('App/Models/User');
 
-const migrateLog = (text) => {
-  console.log('\x1b[36m%s\x1b[0m', 'Ferdi Migration:', '\x1b[0m', text);
+const migrateLog = text => {
+  console.log('\u001B[36m%s\u001B[0m', 'Ferdi Migration:', '\u001B[0m', text);
 };
 
 module.exports = async () => {
   migrateLog('🧙‍  Running database migration wizard');
 
   // Make sure user table exists
-  await Database.raw('CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);');
+  await Database.raw(
+    'CREATE TABLE IF NOT EXISTS `users` (`id` integer not null primary key autoincrement, `settings` text, `created_at` datetime, `updated_at` datetime);',
+  );
 
   const user = await User.find(1);
   let settings;
   if (!user) {
-    migrateLog('🎩  Migrating from old Ferdi version as user doesn\'t exist');
+    migrateLog("🎩  Migrating from old Ferdi version as user doesn't exist");
 
     // Create new user
     await Database.raw('INSERT INTO  "users" ("id") VALUES (\'1\');');
   } else {
-    settings = typeof user.settings === 'string' ? JSON.parse(user.settings) : user.settings;
+    settings =
+      typeof user.settings === 'string'
+        ? JSON.parse(user.settings)
+        : user.settings;
   }
 
-  if (!settings || !settings.db_version || settings.db_version !== ferdiVersion) {
-    const srcVersion = settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
+  if (
+    !settings ||
+    !settings.db_version ||
+    settings.db_version !== ferdiVersion
+  ) {
+    const srcVersion =
+      settings && settings.db_version ? settings.db_version : '5.4.0-beta.2';
     migrateLog(`🔮  Migrating table from ${srcVersion} to ${ferdiVersion}`);
 
     // Migrate database to current Ferdi version
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index e75380ccd..db74479c9 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -8,7 +8,7 @@
 /** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
 const Route = use('Route');
 
-const { API_VERSION } = require('../../environment');
+const { API_VERSION } = require('../../environment-remote');
 // Run latest database migration
 const migrate = require('./migrate');
 
diff --git a/src/internal-server/test.js b/src/internal-server/test.js
deleted file mode 100644
index 8d4807d06..000000000
--- a/src/internal-server/test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const path = require('path');
-const fs = require('fs-extra');
-const server = require('./start');
-
-const dummyUserFolder = path.join(__dirname, 'user_data');
-
-fs.ensureDirSync(dummyUserFolder);
-
-server(dummyUserFolder, 45568);
diff --git a/src/internal-server/test.ts b/src/internal-server/test.ts
new file mode 100644
index 000000000..437a2813b
--- /dev/null
+++ b/src/internal-server/test.ts
@@ -0,0 +1,9 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { server } from './start';
+
+const dummyUserFolder = path.join(__dirname, 'user_data');
+
+fs.ensureDirSync(dummyUserFolder);
+
+server(dummyUserFolder, 45_568);