13 files changed, 70 insertions, 148 deletions
diff --git a/package-lock.json b/package-lock.json
index f810e8bc3..fe083ea78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6513,6 +6513,12 @@
        "@types/ms": "*"
      }
    },
+    "@types/du": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/du/-/du-1.0.0.tgz",
+      "integrity": "sha512-gyG+2sBzYwIcwaj2zyRZ75qOwvhFeD6XytT16jBTyqiS9nH9tYy39Ln1oRcECxBfDCJmUmOEyjQoTHJeMFM91w==",
+      "dev": true
+    },
    "@types/fs-extra": {
      "version": "9.0.12",
      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
@@ -6610,6 +6616,15 @@
      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
      "dev": true
    },
+    "@types/minipass": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/minipass/-/minipass-3.1.0.tgz",
+      "integrity": "sha512-b2yPKwCrB8x9SB65kcCistMoe3wrYnxxt5rJSZ1kprw0uOXvhuKi9kTQ746Y+Pbqoh+9C0N4zt0ztmTnG9yg7A==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
    "@types/ms": {
      "version": "0.7.31",
      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
@@ -6686,6 +6701,12 @@
        "@types/node": "*"
      }
    },
+    "@types/route-parser": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@types/route-parser/-/route-parser-0.1.3.tgz",
+      "integrity": "sha512-1AQYpsMbxangSnApsyIHzck5TP8cfas8fzmemljLi2APssJvlZiHkTar/ZtcZwOtK/Ory/xwLg2X8dwhkbnM+g==",
+      "dev": true
+    },
    "@types/scheduler": {
      "version": "0.16.2",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
@@ -6720,6 +6741,16 @@
      "integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
      "dev": true
    },
+    "@types/tar": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz",
+      "integrity": "sha512-cgwPhNEabHaZcYIy5xeMtux2EmYBitfqEceBUi2t5+ETy4dW6kswt6WX4+HqLeiiKOo42EXbGiDmVJ2x+vi37Q==",
+      "dev": true,
+      "requires": {
+        "@types/minipass": "*",
+        "@types/node": "*"
+      }
+    },
    "@types/uglify-js": {
      "version": "3.13.1",
      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
@@ -8785,39 +8816,6 @@
        "file-uri-to-path": "1.0.0"
      }
    },
-    "bl": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
-      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
-      "requires": {
-        "readable-stream": "^2.3.5",
-        "safe-buffer": "^5.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
    "block-stream": {
      "version": "0.0.9",
      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -9280,6 +9278,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
      "requires": {
        "buffer-alloc-unsafe": "^1.1.0",
        "buffer-fill": "^1.0.0"
@@ -9288,7 +9287,8 @@
    "buffer-alloc-unsafe": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
    },
    "buffer-crc32": {
      "version": "0.2.13",
@@ -9310,7 +9310,8 @@
    "buffer-fill": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
    },
    "buffer-from": {
      "version": "1.1.2",
@@ -12311,18 +12312,11 @@
      "dev": true
    },
    "du": {
-      "version": "0.1.0",
+      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/du/-/du-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/du/-/du-1.0.0.tgz",
-      "integrity": "sha1-8m40CgnHvFtv1pr2263qYPqMb00=",
+      "integrity": "sha512-w00+6XpIq924IvDLyOOx5HFO4KwH6YV6buqFx6og/ErTaJ34kVOyI+Q2f+X8pvZkDoEgT6xspA4iYSN99mqPDA==",
      "requires": {
-        "async": "~0.1.22"
+        "map-async": "~0.1.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.1.22",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz",
-          "integrity": "sha1-D8GqoIig4+8Ovi2IMbqw3PiEUGE="
-        }
      }
    },
    "duplexer": {
@@ -15388,11 +15382,6 @@
        }
      }
    },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-    },
    "fs-extra": {
      "version": "10.0.0",
      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
@@ -21192,6 +21181,11 @@
        "p-defer": "^1.0.0"
      }
    },
+    "map-async": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/map-async/-/map-async-0.1.1.tgz",
+      "integrity": "sha1-yJfARJ+Fhkx0taPxlu20IVZDF0U="
+    },
    "map-cache": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -28096,74 +28090,6 @@
        }
      }
    },
-    "tar-fs": {
-      "version": "1.16.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz",
-      "integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==",
-      "requires": {
-        "chownr": "^1.0.1",
-        "mkdirp": "^0.5.1",
-        "pump": "^1.0.0",
-        "tar-stream": "^1.1.2"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
-          "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "tar-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
-      "requires": {
-        "bl": "^1.0.0",
-        "buffer-alloc": "^1.2.0",
-        "end-of-stream": "^1.0.0",
-        "fs-constants": "^1.0.0",
-        "readable-stream": "^2.3.0",
-        "to-buffer": "^1.1.1",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "targz": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/targz/-/targz-1.0.1.tgz",
-      "integrity": "sha1-j3alI2lM3t+7XWCkB2/27uzFOY8=",
-      "requires": {
-        "tar-fs": "^1.8.1"
-      }
-    },
    "tarn": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz",
@@ -28658,11 +28584,6 @@
      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
      "dev": true
    },
-    "to-buffer": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
-    },
    "to-fast-properties": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
diff --git a/package.json b/package.json
index 1778ab0b7..10eca8882 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
    "darkreader": "4.9.34",
    "dbus-next": "0.9.2",
    "debug": "4.3.2",
-    "du": "0.1.0",
+    "du": "1.0.0",
    "electron-dl": "3.2.1",
    "electron-fetch": "1.7.3",
    "electron-find": "1.0.7",
@@ -127,7 +127,6 @@
    "smoothscroll-polyfill": "0.4.4",
    "sqlite3": "5.0.2",
    "tar": "4.4.15",
-    "targz": "1.0.1",
    "tslib": "2.3.1",
    "useragent-generator": "1.1.1-amkt-22079-finish.0",
    "uuid": "3.3.3",
@@ -151,11 +150,14 @@
    "@commitlint/config-conventional": "13.1.0",
    "@tsconfig/node14": "1.0.1",
    "@types/color": "3.0.2",
+    "@types/du": "1.0.0",
    "@types/fs-extra": "9.0.12",
    "@types/lodash": "4.14.172",
    "@types/node": "14.17.6",
    "@types/react": "16.14.6",
    "@types/react-dom": "16.9.13",
+    "@types/route-parser": "0.1.3",
+    "@types/tar": "4.0.5",
    "@types/uuid": "3.4.9",
    "@typescript-eslint/eslint-plugin": "4.29.1",
    "@typescript-eslint/parser": "4.29.1",
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.ts
index 644f15b93..71721bb0f 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.ts
@@ -8,9 +8,9 @@ const debug = require('debug')('Ferdi:LocalApi');
 export default class LocalApi {
  // Settings
-  getAppSettings(type) {
+  getAppSettings(type: any) {
    return new Promise(resolve => {
-      ipcRenderer.once('appSettings', (event, resp) => {
+      ipcRenderer.once('appSettings', (_event, resp) => {
        debug('LocalApi::getAppSettings resolves', resp.type, resp.data);
        resolve(resp);
      });
@@ -19,7 +19,7 @@ export default class LocalApi {
    });
  }
-  async updateAppSettings(type, data) {
+  async updateAppSettings(type: any, data: any) {
    debug('LocalApi::updateAppSettings resolves', type, data);
    ipcRenderer.send('updateAppSettings', {
      type,
@@ -31,7 +31,7 @@ export default class LocalApi {
  async getAppCacheSize() {
    const partitionsDir = getServicePartitionsDirectory();
    return new Promise((resolve, reject) => {
-      du(partitionsDir, (err, size) => {
+      du(partitionsDir, (err: Error | null, size?: number | undefined) => {
        if (err) reject(err);
        debug('LocalApi::getAppCacheSize resolves', size);
@@ -40,7 +40,7 @@ export default class LocalApi {
    });
  }
-  async clearCache(serviceId = null) {
+  async clearCache(serviceId: string | null = null) {
    const s = serviceId
      ? session.fromPartition(`persist:service-${serviceId}`)
      : session.defaultSession;
diff --git a/src/helpers/array-helpers.js b/src/helpers/array-helpers.ts
index 5e592b7f7..ae5d8d99f 100644
--- a/src/helpers/array-helpers.js
+++ b/src/helpers/array-helpers.ts
@@ -1,4 +1,4 @@
-export const shuffleArray = (arr) => arr
+export const shuffleArray = (arr: any[]) => arr
  .map((a) => [Math.random(), a])
  .sort((a, b) => a[0] - b[0])
  .map((a) => a[1]);
diff --git a/src/helpers/asar-helpers.js b/src/helpers/asar-helpers.ts
index 9e4380c06..3d9f0d941 100644
--- a/src/helpers/asar-helpers.js
+++ b/src/helpers/asar-helpers.ts
@@ -1,3 +1,3 @@
-export function asarPath(dir = '') {
+export function asarPath(dir: string = '') {
  return dir.replace('app.asar', 'app.asar.unpacked');
 }
diff --git a/src/helpers/async-helpers.js b/src/helpers/async-helpers.ts
index c6c57e28e..aae3c3928 100644
--- a/src/helpers/async-helpers.js
+++ b/src/helpers/async-helpers.ts
@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-export function sleep(ms = 0) {
+export function sleep(ms: number = 0) {
  return new Promise((r) => setTimeout(r, ms));
 }
diff --git a/src/helpers/i18n-helpers.js b/src/helpers/i18n-helpers.ts
index 807b9066e..c1f18f446 100644
--- a/src/helpers/i18n-helpers.js
+++ b/src/helpers/i18n-helpers.ts
@@ -3,7 +3,7 @@ export function getLocale({
 }) {
  let localeStr = locale;
  if (locales[locale] === undefined) {
-    let localeFuzzy;
+    let localeFuzzy: string | undefined;
    Object.keys(locales).forEach((localStr) => {
      if (locales && Object.hasOwnProperty.call(locales, localStr)) {
        if (locale.substring(0, 2) === localStr.substring(0, 2)) {
@@ -31,7 +31,7 @@ export function getLocale({
 export function getSelectOptions({
  locales, resetToDefaultText = '', automaticDetectionText = '', sort = true,
 }) {
-  const options = [];
+  const options: object[] = [];
  if (resetToDefaultText) {
    options.push(
diff --git a/src/helpers/password-helpers.js b/src/helpers/password-helpers.ts
index cf461e4f7..89c75c752 100644
--- a/src/helpers/password-helpers.js
+++ b/src/helpers/password-helpers.ts
@@ -1,10 +1,10 @@
 import crypto from 'crypto';
-export function hash(password) {
+export function hash(password: crypto.BinaryLike) {
  return crypto.createHash('sha256').update(password).digest('base64');
 }
-export function scorePassword(password) {
+export function scorePassword(password: string) {
  let score = 0;
  if (!password) {
    return score;
@@ -32,5 +32,5 @@ export function scorePassword(password) {
  score += (variationCount - 1) * 10;
-  return parseInt(score, 10);
+  return parseInt(score.toString(), 10);
 }
diff --git a/src/helpers/recipe-helpers.js b/src/helpers/recipe-helpers.ts
index 7e4bfa85a..965429210 100644
--- a/src/helpers/recipe-helpers.js
+++ b/src/helpers/recipe-helpers.ts
@@ -1,15 +1,15 @@
 import { parse } from 'path';
 import { userDataRecipesPath } from '../environment';
-export function getRecipeDirectory(id = '') {
+export function getRecipeDirectory(id: string = ''): string {
  return userDataRecipesPath(id);
 }
-export function getDevRecipeDirectory(id = '') {
+export function getDevRecipeDirectory(id: string = ''): string {
  return userDataRecipesPath('dev', id);
 }
-export function loadRecipeConfig(recipeId) {
+export function loadRecipeConfig(recipeId: string) {
  try {
    const configPath = `${recipeId}/package.json`;
    // Delete module from cache
diff --git a/src/helpers/routing-helpers.js b/src/helpers/routing-helpers.js
deleted file mode 100644
index 14922ebf3..000000000
--- a/src/helpers/routing-helpers.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import RouteParser from 'route-parser';
-// eslint-disable-next-line
-export const matchRoute = (pattern, path) => new RouteParser(pattern).match(path);
diff --git a/src/helpers/routing-helpers.ts b/src/helpers/routing-helpers.ts
new file mode 100644
index 000000000..18169f01b
--- /dev/null
+++ b/src/helpers/routing-helpers.ts
@@ -0,0 +1,3 @@
+import RouteParser from 'route-parser';
+export const matchRoute = (pattern: string, path: string) => new RouteParser(pattern).match(path);
diff --git a/src/helpers/schedule-helpers.js b/src/helpers/schedule-helpers.ts
index a3020cad6..754fd5556 100644
--- a/src/helpers/schedule-helpers.js
+++ b/src/helpers/schedule-helpers.ts
@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
-export function isInTimeframe(start, end) {
+export function isInTimeframe(start: string, end: string) {
  const [
    startHourStr,
    startMinuteStr,
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.ts
index ede5e6dc4..73c8bfd03 100644
--- a/src/helpers/userAgent-helpers.js
+++ b/src/helpers/userAgent-helpers.ts
@@ -6,7 +6,7 @@ import {
 } from '../environment';
 function macOS() {
-  const version = macosVersion();
+  const version = macosVersion() || '';
  let cpuName = os.cpus()[0].model.split(' ')[0];
  if (cpuName && cpuName.match(/\(/)) {
    cpuName = cpuName.split('(')[0];