fix: semver comparaison client side

2022-11-05 12:24:23 +01:00 · 2022-11-05 12:24:23 +01:00 · 65ff20387a
commit 65ff20387a
parent 0ea17b7901
11 changed files with 293 additions and 209 deletions
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@ -32,6 +32,7 @@
    "remark-breaks": "^3.0.2",
    "remark-gfm": "^3.0.1",
    "remark-mdx": "^2.1.1",
+    "semver": "^7.3.7",
    "swr": "^1.3.0",
    "tslib": "^2.4.0",
    "validator": "^13.7.0",
@ -48,6 +49,7 @@
    "@types/react": "18.0.8",
    "@types/react-dom": "18.0.3",
    "@types/react-slick": "^0.23.8",
+    "@types/semver": "^7.3.12",
    "@types/validator": "^13.7.2",
    "@typescript-eslint/eslint-plugin": "^5.18.0",
    "@typescript-eslint/parser": "^5.0.0",
--- a/packages/dashboard/src/pages/settings.tsx
+++ b/packages/dashboard/src/pages/settings.tsx
@ -3,6 +3,7 @@ import { AlertDialog, AlertDialogBody, AlertDialogContent, AlertDialogFooter, Al
 import Layout from '../components/Layout';
 import { useLogoutMutation, useRestartMutation, useUpdateMutation, useVersionQuery } from '../generated/graphql';
 import { useRef, useState } from 'react';
+import semver from 'semver';

 const Settings: NextPage = () => {
  const toast = useToast();
@ -15,7 +16,9 @@ const Settings: NextPage = () => {
  const [restart] = useRestartMutation();
  const [update] = useUpdateMutation();
  const [logout] = useLogoutMutation({ refetchQueries: ['Me'] });
-  const isLatest = data?.version.latest === data?.version.current;
+
+  const defaultVersion = '0.0.0';
+  const isLatest = semver.gte(data?.version.latest || defaultVersion, data?.version.current || defaultVersion);

  const handleError = (error: unknown) => {
    if (error instanceof Error) {
--- a/packages/dashboard/src/utils/typescript.ts
+++ b/packages/dashboard/src/utils/typescript.ts
@ -1,4 +1,4 @@
-const objectKeys = <T>(obj: T): (keyof T)[] => Object.keys(obj) as (keyof T)[];
+const objectKeys = <T extends object>(obj: T): (keyof T)[] => Object.keys(obj) as (keyof T)[];

 function nonNullable<T>(value: T): value is NonNullable<T> {
  return value !== null && value !== undefined;
--- a/packages/system-api/mocks/internal-ip.ts
+++ b/packages/system-api/mocks/internal-ip.ts
@ -1,11 +0,0 @@
-import { faker } from '@faker-js/faker';
-
-const internalIp: { v4: typeof v4Mock } = jest.genMockFromModule('internal-ip');
-
-const v4Mock = () => {
-  return faker.internet.ipv4();
-};
-
-internalIp.v4 = v4Mock;
-
-module.exports = internalIp;
--- a/packages/system-api/mocks/tcp-port-used.ts
+++ b/packages/system-api/mocks/tcp-port-used.ts
@ -1,9 +0,0 @@
-import portUsed, { TcpPortUsedOptions } from 'tcp-port-used';
-
-const internalIp: { check: typeof portUsed.check } = jest.genMockFromModule('tcp-port-used');
-
-internalIp.check = async (_: number | TcpPortUsedOptions, __?: string | undefined) => {
-  return true;
-};
-
-module.exports = internalIp;
--- a/packages/system-api/package.json
+++ b/packages/system-api/package.json
@ -37,16 +37,13 @@
    "graphql": "^15.3.0",
    "graphql-type-json": "^0.3.2",
    "http": "0.0.1-security",
-    "internal-ip": "^6.0.0",
    "jsonwebtoken": "^8.5.1",
    "node-cache": "^5.1.2",
    "node-cron": "^3.0.1",
-    "node-port-scanner": "^3.0.1",
    "pg": "^8.7.3",
    "redis": "^4.3.1",
    "reflect-metadata": "^0.1.13",
    "semver": "^7.3.7",
-    "tcp-port-used": "^1.0.2",
    "type-graphql": "^1.1.1",
    "typeorm": "^0.3.6",
    "uuid": "^9.0.0",
@ -67,7 +64,6 @@
    "@types/node-cron": "^3.0.2",
    "@types/pg": "^8.6.5",
    "@types/semver": "^7.3.12",
-    "@types/tcp-port-used": "^1.0.1",
    "@types/uuid": "^8.3.4",
    "@types/validator": "^13.7.2",
    "@typescript-eslint/eslint-plugin": "^5.18.0",
--- a/packages/system-api/src/modules/apps/tests/apps.helpers.test.ts
+++ b/packages/system-api/src/modules/apps/tests/apps.helpers.test.ts
@ -10,16 +10,6 @@ import { createApp } from './apps.factory';

 jest.mock('fs-extra');
 jest.mock('child_process');
-jest.mock('internal-ip');
-
-jest.mock('tcp-port-used', () => ({
-  check: (port: number) => {
-    if (port === 53) {
-      return true;
-    }
-    return false;
-  },
-}));

 let db: DataSource | null = null;
 const TEST_SUITE = 'appshelpers';
@ -51,15 +41,6 @@ describe('checkAppRequirements', () => {
  it('Should throw an error if app does not exist', async () => {
    await expect(checkAppRequirements('not-existing-app')).rejects.toThrow('App not-existing-app not found');
  });
-
-  it('Should return false if a required port is in use', async () => {
-    const { appInfo, MockFiles } = await createApp({ requiredPort: 53 });
-    // @ts-ignore
-    fs.__createMockFiles(MockFiles);
-
-    const ivValid = await checkAppRequirements(appInfo.id);
-    expect(ivValid).toBe(false);
-  });
 });

 describe('getEnvMap', () => {
--- a/packages/system-api/src/modules/apps/tests/apps.resolver.test.ts
+++ b/packages/system-api/src/modules/apps/tests/apps.resolver.test.ts
@ -14,8 +14,6 @@ import EventDispatcher from '../../../core/config/EventDispatcher';

 jest.mock('fs');
 jest.mock('child_process');
-jest.mock('internal-ip');
-jest.mock('tcp-port-used');

 type TApp = App & {
  info: AppInfo;
@ -220,23 +218,6 @@ describe('InstallApp', () => {
    expect(errors?.[0].message).toBe(`Variable ${app1.form_fields?.[0].env_variable} is required`);
    expect(data?.installApp).toBeUndefined();
  });
-
-  it('Should throw an error if the requirements are not met', async () => {
-    const { appInfo, MockFiles } = await createApp({ requiredPort: 400 });
-    // @ts-ignore
-    fs.__createMockFiles(MockFiles);
-
-    const user = await createUser();
-
-    const { data, errors } = await gcall<{ installApp: TApp }>({
-      source: installAppMutation,
-      userId: user.id,
-      variableValues: { input: { id: appInfo.id, form: { TEST_FIELD: 'hello' }, exposed: false, domain: '' } },
-    });
-
-    expect(errors?.[0].message).toBe(`App ${appInfo.id} requirements not met`);
-    expect(data?.installApp).toBeUndefined();
-  });
 });

 describe('StartApp', () => {
--- a/packages/system-api/src/modules/apps/apps.helpers.ts
+++ b/packages/system-api/src/modules/apps/apps.helpers.ts
@ -1,6 +1,4 @@
-import portUsed from 'tcp-port-used';
 import { fileExists, getSeed, readdirSync, readFile, readJsonFile, writeFile } from '../fs/fs.helpers';
-import InternalIp from 'internal-ip';
 import crypto from 'crypto';
 import { AppInfo, AppStatusEnum } from './apps.types';
 import logger from '../../config/logger/logger';
@ -17,15 +15,6 @@ export const checkAppRequirements = async (appName: string) => {
    throw new Error(`App ${appName} not found`);
  }

-  if (configFile?.requirements?.ports) {
-    for (const port of configFile.requirements.ports) {
-      const ip = await InternalIp.v4();
-      const used = await portUsed.check(port, ip);
-
-      if (used) valid = false;
-    }
-  }
-
  if (configFile?.supported_architectures && !configFile.supported_architectures.includes(getConfig().architecture)) {
    throw new Error(`App ${appName} is not supported on this architecture`);
  }
--- a/packages/system-api/src/modules/system/system.service.ts
+++ b/packages/system-api/src/modules/system/system.service.ts
@ -45,7 +45,7 @@ const getVersion = async (): Promise<{ current: string; latest?: string }> => {
      version = data.name.replace('v', '');
    }

-    await TipiCache.set('latestVersion', version?.replace('v', '') || '');
+    await TipiCache.set('latestVersion', version?.replace('v', '') || '', 60 * 60);

    return { current: getConfig().version, latest: version?.replace('v', '') };
  } catch (e) {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -35,6 +35,7 @@ importers:
      '@types/react': 18.0.8
      '@types/react-dom': 18.0.3
      '@types/react-slick': ^0.23.8
+      '@types/semver': ^7.3.12
      '@types/validator': ^13.7.2
      '@typescript-eslint/eslint-plugin': ^5.18.0
      '@typescript-eslint/parser': ^5.0.0
@ -60,6 +61,7 @@ importers:
      remark-breaks: ^3.0.2
      remark-gfm: ^3.0.1
      remark-mdx: ^2.1.1
+      semver: ^7.3.7
      swr: ^1.3.0
      tailwindcss: ^3.0.23
      ts-jest: ^28.0.2
@ -88,6 +90,7 @@ importers:
      remark-breaks: 3.0.2
      remark-gfm: 3.0.1
      remark-mdx: 2.1.1
+      semver: 7.3.7
      swr: 1.3.0_react@18.1.0
      tslib: 2.4.0
      validator: 13.7.0
@ -103,6 +106,7 @@ importers:
      '@types/react': 18.0.8
      '@types/react-dom': 18.0.3
      '@types/react-slick': 0.23.8
+      '@types/semver': 7.3.12
      '@types/validator': 13.7.2
      '@typescript-eslint/eslint-plugin': 5.22.0_oztpoyrbzkyaikrhdkppp3gagu
      '@typescript-eslint/parser': 5.22.0_uhoeudlwl7kc47h4kncsfowede
@ -131,7 +135,6 @@ importers:
      '@types/node-cron': ^3.0.2
      '@types/pg': ^8.6.5
      '@types/semver': ^7.3.12
-      '@types/tcp-port-used': ^1.0.1
      '@types/uuid': ^8.3.4
      '@types/validator': ^13.7.2
      '@typescript-eslint/eslint-plugin': ^5.18.0
@ -144,6 +147,7 @@ importers:
      concurrently: ^7.1.0
      cors: ^2.8.5
      dotenv: ^16.0.0
+      esbuild: ^0.15.13
      eslint: ^8.13.0
      eslint-config-airbnb-typescript: ^17.0.0
      eslint-config-prettier: ^8.5.0
@ -155,12 +159,10 @@ importers:
      graphql-import-node: ^0.0.5
      graphql-type-json: ^0.3.2
      http: 0.0.1-security
-      internal-ip: ^6.0.0
      jest: ^28.1.0
      jsonwebtoken: ^8.5.1
      node-cache: ^5.1.2
      node-cron: ^3.0.1
-      node-port-scanner: ^3.0.1
      nodemon: ^2.0.15
      pg: ^8.7.3
      prettier: 2.6.2
@ -168,7 +170,6 @@ importers:
      reflect-metadata: ^0.1.13
      rimraf: ^3.0.2
      semver: ^7.3.7
-      tcp-port-used: ^1.0.2
      ts-jest: ^28.0.2
      ts-node: ^10.8.2
      type-graphql: ^1.1.1
@ -191,16 +192,13 @@ importers:
      graphql: 15.8.0
      graphql-type-json: 0.3.2_graphql@15.8.0
      http: 0.0.1-security
-      internal-ip: 6.2.0
      jsonwebtoken: 8.5.1
      node-cache: 5.1.2
      node-cron: 3.0.1
-      node-port-scanner: 3.0.1
      pg: 8.7.3
      redis: 4.3.1
      reflect-metadata: 0.1.13
      semver: 7.3.7
-      tcp-port-used: 1.0.2
      type-graphql: 1.1.1_v2revtygxcm7xrdg2oz3ssohfu
      typeorm: 0.3.6_rymjtjxvmmxrsowl5wrmwxcyqa
      uuid: 9.0.0
@ -220,12 +218,12 @@ importers:
      '@types/node-cron': 3.0.2
      '@types/pg': 8.6.5
      '@types/semver': 7.3.12
-      '@types/tcp-port-used': 1.0.1
      '@types/uuid': 8.3.4
      '@types/validator': 13.7.2
      '@typescript-eslint/eslint-plugin': 5.22.0_tal4xlmvnofklupd3hwjtzfb4q
      '@typescript-eslint/parser': 5.22.0_hcfsmds2fshutdssjqluwm76uu
      concurrently: 7.1.0
+      esbuild: 0.15.13
      eslint: 8.15.0
      eslint-config-airbnb-typescript: 17.0.0_c2ouaf3l4ivgkc6ae4nebvztom
      eslint-config-prettier: 8.5.0_eslint@8.15.0
@ -236,7 +234,7 @@ importers:
      nodemon: 2.0.16
      prettier: 2.6.2
      rimraf: 3.0.2
-      ts-jest: 28.0.2_z3fx76c5ksuwr36so7o5uc2kcy
+      ts-jest: 28.0.2_mlhfkqsuuditdvydbpk2q36p6y
      ts-node: 10.8.2_uva6s4l7h33czpzezvop6ux5pe
      typescript: 4.6.4

@ -2316,6 +2314,24 @@ packages:
      - typescript
    dev: true

+  /@esbuild/android-arm/0.15.13:
+    resolution: {integrity: sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-loong64/0.15.13:
+    resolution: {integrity: sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
  /@eslint/eslintrc/1.2.3:
    resolution: {integrity: sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -3961,10 +3977,6 @@ packages:
    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
    dev: true

-  /@types/tcp-port-used/1.0.1:
-    resolution: {integrity: sha512-6pwWTx8oUtWvsiZUCrhrK/53MzKVLnuNSSaZILPy3uMes9QnTrLMar9BDlJArbMOjDcjb3QXFk6Rz8qmmuySZw==}
-    dev: true
-
  /@types/unist/2.0.6:
    resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
    dev: false
@ -5628,6 +5640,7 @@ packages:
      path-key: 3.1.1
      shebang-command: 2.0.0
      which: 2.0.2
+    dev: true

  /cross-undici-fetch/0.4.7:
    resolution: {integrity: sha512-e5KZdjHigxFECfw1B7cjmXLm3yT8eiffSJYUSyIWxy6c+f/MGiJsV1NHegZvG23ZgQ0o8rNaZxbtu5NdF5FmwQ==}
@ -5742,18 +5755,6 @@ packages:
      supports-color: 5.5.0
    dev: true

-  /debug/4.3.1:
-    resolution: {integrity: sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-    dev: false
-
  /debug/4.3.4:
    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
    engines: {node: '>=6.0'}
@ -5802,19 +5803,13 @@ packages:

  /deep-is/0.1.4:
    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+    dev: true

  /deepmerge/4.2.2:
    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
    engines: {node: '>=0.10.0'}
    dev: true

-  /default-gateway/6.0.3:
-    resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==}
-    engines: {node: '>= 10'}
-    dependencies:
-      execa: 5.1.1
-    dev: false
-
  /defaults/1.0.3:
    resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==}
    dependencies:
@ -6077,6 +6072,216 @@ packages:
      is-symbol: 1.0.4
    dev: true

+  /esbuild-android-64/0.15.13:
+    resolution: {integrity: sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-android-arm64/0.15.13:
+    resolution: {integrity: sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-darwin-64/0.15.13:
+    resolution: {integrity: sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-darwin-arm64/0.15.13:
+    resolution: {integrity: sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-freebsd-64/0.15.13:
+    resolution: {integrity: sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-freebsd-arm64/0.15.13:
+    resolution: {integrity: sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-32/0.15.13:
+    resolution: {integrity: sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-64/0.15.13:
+    resolution: {integrity: sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-arm/0.15.13:
+    resolution: {integrity: sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-arm64/0.15.13:
+    resolution: {integrity: sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-mips64le/0.15.13:
+    resolution: {integrity: sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-ppc64le/0.15.13:
+    resolution: {integrity: sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-riscv64/0.15.13:
+    resolution: {integrity: sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-s390x/0.15.13:
+    resolution: {integrity: sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-netbsd-64/0.15.13:
+    resolution: {integrity: sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-openbsd-64/0.15.13:
+    resolution: {integrity: sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-sunos-64/0.15.13:
+    resolution: {integrity: sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-windows-32/0.15.13:
+    resolution: {integrity: sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-windows-64/0.15.13:
+    resolution: {integrity: sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-windows-arm64/0.15.13:
+    resolution: {integrity: sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild/0.15.13:
+    resolution: {integrity: sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.15.13
+      '@esbuild/linux-loong64': 0.15.13
+      esbuild-android-64: 0.15.13
+      esbuild-android-arm64: 0.15.13
+      esbuild-darwin-64: 0.15.13
+      esbuild-darwin-arm64: 0.15.13
+      esbuild-freebsd-64: 0.15.13
+      esbuild-freebsd-arm64: 0.15.13
+      esbuild-linux-32: 0.15.13
+      esbuild-linux-64: 0.15.13
+      esbuild-linux-arm: 0.15.13
+      esbuild-linux-arm64: 0.15.13
+      esbuild-linux-mips64le: 0.15.13
+      esbuild-linux-ppc64le: 0.15.13
+      esbuild-linux-riscv64: 0.15.13
+      esbuild-linux-s390x: 0.15.13
+      esbuild-netbsd-64: 0.15.13
+      esbuild-openbsd-64: 0.15.13
+      esbuild-sunos-64: 0.15.13
+      esbuild-windows-32: 0.15.13
+      esbuild-windows-64: 0.15.13
+      esbuild-windows-arm64: 0.15.13
+    dev: true
+
  /escalade/3.1.1:
    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
    engines: {node: '>=6'}
@ -6668,6 +6873,7 @@ packages:
      onetime: 5.1.2
      signal-exit: 3.0.7
      strip-final-newline: 2.0.0
+    dev: true

  /exit/0.1.2:
    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
@ -7131,6 +7337,7 @@ packages:
  /get-stream/6.0.1:
    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
    engines: {node: '>=10'}
+    dev: true

  /get-symbol-description/1.0.0:
    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
@ -7527,6 +7734,7 @@ packages:
  /human-signals/2.1.0:
    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
    engines: {node: '>=10.17.0'}
+    dev: true

  /husky/8.0.1:
    resolution: {integrity: sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==}
@ -7641,16 +7849,6 @@ packages:
      wrap-ansi: 7.0.0
    dev: true

-  /internal-ip/6.2.0:
-    resolution: {integrity: sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==}
-    engines: {node: '>=10'}
-    dependencies:
-      default-gateway: 6.0.3
-      ipaddr.js: 1.9.1
-      is-ip: 3.1.0
-      p-event: 4.2.0
-    dev: false
-
  /internal-slot/1.0.3:
    resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
    engines: {node: '>= 0.4'}
@ -7665,11 +7863,6 @@ packages:
    dependencies:
      loose-envify: 1.4.0

-  /ip-regex/4.3.0:
-    resolution: {integrity: sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==}
-    engines: {node: '>=8'}
-    dev: false
-
  /ipaddr.js/1.9.1:
    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
    engines: {node: '>= 0.10'}
@ -7805,13 +7998,6 @@ packages:
    engines: {node: '>=8'}
    dev: true

-  /is-ip/3.1.0:
-    resolution: {integrity: sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==}
-    engines: {node: '>=8'}
-    dependencies:
-      ip-regex: 4.3.0
-    dev: false
-
  /is-lower-case/2.0.2:
    resolution: {integrity: sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==}
    dependencies:
@ -7944,10 +8130,6 @@ packages:
      tslib: 2.4.0
    dev: true

-  /is-url/1.2.4:
-    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
-    dev: false
-
  /is-utf8/0.2.1:
    resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
    dev: true
@ -7967,17 +8149,9 @@ packages:
    resolution: {integrity: sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==}
    dev: true

-  /is2/2.0.7:
-    resolution: {integrity: sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==}
-    engines: {node: '>=v0.10.0'}
-    dependencies:
-      deep-is: 0.1.4
-      ip-regex: 4.3.0
-      is-url: 1.2.4
-    dev: false
-
  /isexe/2.0.0:
    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+    dev: true

  /isomorphic-fetch/3.0.0:
    resolution: {integrity: sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==}
@ -9203,6 +9377,7 @@ packages:

  /merge-stream/2.0.0:
    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+    dev: true

  /merge/2.1.1:
    resolution: {integrity: sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==}
@ -9594,6 +9769,7 @@ packages:
  /mimic-fn/2.1.0:
    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
    engines: {node: '>=6'}
+    dev: true

  /mimic-response/1.0.1:
    resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
@ -9778,10 +9954,6 @@ packages:
    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
    dev: true

-  /node-port-scanner/3.0.1:
-    resolution: {integrity: sha512-TuFGEWfye+1atB74v0Vm6myEjpq0L5Jo3UaOG9xgtYHxnFZN0fF9CnwCxp7ENWDerGbI1UXAgdRMIPz8TM73Hg==}
-    dev: false
-
  /node-releases/2.0.4:
    resolution: {integrity: sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==}
    dev: true
@ -9865,6 +10037,7 @@ packages:
    engines: {node: '>=8'}
    dependencies:
      path-key: 3.1.1
+    dev: true

  /npmlog/5.0.1:
    resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
@ -9975,6 +10148,7 @@ packages:
    engines: {node: '>=6'}
    dependencies:
      mimic-fn: 2.1.0
+    dev: true

  /optimism/0.16.1:
    resolution: {integrity: sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==}
@ -10020,18 +10194,6 @@ packages:
    engines: {node: '>=6'}
    dev: true

-  /p-event/4.2.0:
-    resolution: {integrity: sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-timeout: 3.2.0
-    dev: false
-
-  /p-finally/1.0.0:
-    resolution: {integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=}
-    engines: {node: '>=4'}
-    dev: false
-
  /p-limit/1.3.0:
    resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
    engines: {node: '>=4'}
@ -10079,13 +10241,6 @@ packages:
    engines: {node: '>=6'}
    dev: true

-  /p-timeout/3.2.0:
-    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-finally: 1.0.0
-    dev: false
-
  /p-try/1.0.0:
    resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
    engines: {node: '>=4'}
@ -10209,6 +10364,7 @@ packages:
  /path-key/3.1.1:
    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
    engines: {node: '>=8'}
+    dev: true

  /path-parse/1.0.7:
    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
@ -11150,10 +11306,12 @@ packages:
    engines: {node: '>=8'}
    dependencies:
      shebang-regex: 3.0.0
+    dev: true

  /shebang-regex/3.0.0:
    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
    engines: {node: '>=8'}
+    dev: true

  /side-channel/1.0.4:
    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
@ -11412,6 +11570,7 @@ packages:
  /strip-final-newline/2.0.0:
    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
    engines: {node: '>=6'}
+    dev: true

  /strip-indent/3.0.0:
    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
@ -11576,15 +11735,6 @@ packages:
      yallist: 4.0.0
    dev: false

-  /tcp-port-used/1.0.2:
-    resolution: {integrity: sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==}
-    dependencies:
-      debug: 4.3.1
-      is2: 2.0.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
  /terminal-link/2.1.1:
    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
    engines: {node: '>=8'}
@ -11723,6 +11873,41 @@ packages:
      tslib: 2.4.0
    dev: false

+  /ts-jest/28.0.2_mlhfkqsuuditdvydbpk2q36p6y:
+    resolution: {integrity: sha512-IOZMb3D0gx6IHO9ywPgiQxJ3Zl4ECylEFwoVpENB55aTn5sdO0Ptyx/7noNBxAaUff708RqQL4XBNxxOVjY0vQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@types/jest': ^27.0.0
+      babel-jest: ^28.0.0
+      esbuild: '*'
+      jest: ^28.0.0
+      typescript: '>=4.3'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@types/jest':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+    dependencies:
+      '@types/jest': 27.5.0
+      bs-logger: 0.2.6
+      esbuild: 0.15.13
+      fast-json-stable-stringify: 2.1.0
+      jest: 28.1.0_qxft4nzwxz7jey57xog52j3doy
+      jest-util: 28.1.0
+      json5: 2.2.1
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.3.7
+      typescript: 4.6.4
+      yargs-parser: 20.2.9
+    dev: true
+
  /ts-jest/28.0.2_ps5qfvt5fosg52obpfzuxthwve:
    resolution: {integrity: sha512-IOZMb3D0gx6IHO9ywPgiQxJ3Zl4ECylEFwoVpENB55aTn5sdO0Ptyx/7noNBxAaUff708RqQL4XBNxxOVjY0vQ==}
    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
@ -11757,40 +11942,6 @@ packages:
      yargs-parser: 20.2.9
    dev: true

-  /ts-jest/28.0.2_z3fx76c5ksuwr36so7o5uc2kcy:
-    resolution: {integrity: sha512-IOZMb3D0gx6IHO9ywPgiQxJ3Zl4ECylEFwoVpENB55aTn5sdO0Ptyx/7noNBxAaUff708RqQL4XBNxxOVjY0vQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@types/jest': ^27.0.0
-      babel-jest: ^28.0.0
-      esbuild: '*'
-      jest: ^28.0.0
-      typescript: '>=4.3'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@types/jest':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      '@types/jest': 27.5.0
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 28.1.0_qxft4nzwxz7jey57xog52j3doy
-      jest-util: 28.1.0
-      json5: 2.2.1
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.3.7
-      typescript: 4.6.4
-      yargs-parser: 20.2.9
-    dev: true
-
  /ts-log/2.2.4:
    resolution: {integrity: sha512-DEQrfv6l7IvN2jlzc/VTdZJYsWUnQNCsueYjMkC/iXoEoi5fNan6MjeDqkvhfzbmHgdz9UxDUluX3V5HdjTydQ==}
    dev: true
@ -12438,6 +12589,7 @@ packages:
    hasBin: true
    dependencies:
      isexe: 2.0.0
+    dev: true

  /wide-align/1.1.5:
    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}