From 4635fe233b4660d5d44d97368175ff4bf697b90b Mon Sep 17 00:00:00 2001 From: Danish Date: Wed, 21 Sep 2022 18:23:13 +0500 Subject: [PATCH 1/4] event added for disk space check --- src/@types/ipc_channels.ts | 1 + src/dashboard/index.ts | 14 +++++++++++++- src/installer/service.ts | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/@types/ipc_channels.ts b/src/@types/ipc_channels.ts index be4d4f3..b397b41 100644 --- a/src/@types/ipc_channels.ts +++ b/src/@types/ipc_channels.ts @@ -7,6 +7,7 @@ export enum InstallerChannelsEnum { create_dirs = 'install:create_dirs', clone_repos = 'install:clone_repos', open_terms_link = 'install:open_terms_link', + disk_space = 'install:disk_space', } export enum WelcomeChannelsEnum { diff --git a/src/dashboard/index.ts b/src/dashboard/index.ts index 738740a..6af5202 100644 --- a/src/dashboard/index.ts +++ b/src/dashboard/index.ts @@ -19,7 +19,8 @@ import { GenericChannelsEnum, NodeChannelsEnum, PointSDKChannelsEnum, - UninstallerChannelsEnum + UninstallerChannelsEnum, + InstallerChannelsEnum } from '../@types/ipc_channels'; import {EventListener, UpdateLog} from '../@types/generic'; import {ErrorsEnum} from '../@types/errors'; @@ -241,6 +242,17 @@ export default async function () { }; const events: EventListener[] = [ + // Check avalible disk space to install + { + channel: InstallerChannelsEnum.disk_space, + listener() { + try { + // new Bounty({window: window!}).sendGenerated(); + } catch (error) { + logger.error({errorType: ErrorsEnum.DASHBOARD_ERROR, error}); + } + } + }, // Bounty channels { channel: BountyChannelsEnum.send_generated, diff --git a/src/installer/service.ts b/src/installer/service.ts index f2a8002..53a7b6f 100644 --- a/src/installer/service.ts +++ b/src/installer/service.ts @@ -20,7 +20,6 @@ import fs from 'fs-extra'; const POINT_SRC_DIR = helpers.getPointSrcPath(); const POINT_LIVE_DIR = helpers.getLiveDirectoryPath(); - const DIRECTORIES = [helpers.getPointSoftwarePath(), POINT_LIVE_DIR]; const REPOSITORIES = ['liveprofile']; From 05a359c7ed09d07b343bc607afe6ef094fd0d237 Mon Sep 17 00:00:00 2001 From: Danish Date: Fri, 23 Sep 2022 17:07:21 +0500 Subject: [PATCH 2/4] complete disk error done --- package-lock.json | 16 ++ src/@types/ipc_channels.ts | 2 +- src/dashboard/index.ts | 11 -- src/installer/service.ts | 4 + src/installer/ui/App.tsx | 371 +++++++++++++++++++------------------ yarn.lock | 186 ++++++++++++++++++- 6 files changed, 398 insertions(+), 192 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3a0379..13afc81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21324,6 +21324,8 @@ }, "node_modules/npm/node_modules/debug/node_modules/ms": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "inBundle": true, "license": "MIT" }, @@ -22213,6 +22215,8 @@ }, "node_modules/npm/node_modules/node-gyp/node_modules/glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "inBundle": true, "license": "ISC", "dependencies": { @@ -22710,6 +22714,8 @@ }, "node_modules/npm/node_modules/rimraf/node_modules/glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "inBundle": true, "license": "ISC", "dependencies": { @@ -22787,6 +22793,8 @@ }, "node_modules/npm/node_modules/semver/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "inBundle": true, "license": "ISC", "dependencies": { @@ -45548,6 +45556,8 @@ "dependencies": { "ms": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "bundled": true } } @@ -46205,6 +46215,8 @@ }, "glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "bundled": true, "requires": { "fs.realpath": "^1.0.0", @@ -46563,6 +46575,8 @@ }, "glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "bundled": true, "requires": { "fs.realpath": "^1.0.0", @@ -46608,6 +46622,8 @@ "dependencies": { "lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "bundled": true, "requires": { "yallist": "^4.0.0" diff --git a/src/@types/ipc_channels.ts b/src/@types/ipc_channels.ts index b397b41..8407fd3 100644 --- a/src/@types/ipc_channels.ts +++ b/src/@types/ipc_channels.ts @@ -7,7 +7,7 @@ export enum InstallerChannelsEnum { create_dirs = 'install:create_dirs', clone_repos = 'install:clone_repos', open_terms_link = 'install:open_terms_link', - disk_space = 'install:disk_space', + disk_error = 'install:disk_space_error', } export enum WelcomeChannelsEnum { diff --git a/src/dashboard/index.ts b/src/dashboard/index.ts index 6af5202..ff432f7 100644 --- a/src/dashboard/index.ts +++ b/src/dashboard/index.ts @@ -242,17 +242,6 @@ export default async function () { }; const events: EventListener[] = [ - // Check avalible disk space to install - { - channel: InstallerChannelsEnum.disk_space, - listener() { - try { - // new Bounty({window: window!}).sendGenerated(); - } catch (error) { - logger.error({errorType: ErrorsEnum.DASHBOARD_ERROR, error}); - } - } - }, // Bounty channels { channel: BountyChannelsEnum.send_generated, diff --git a/src/installer/service.ts b/src/installer/service.ts index 53a7b6f..2f0860d 100644 --- a/src/installer/service.ts +++ b/src/installer/service.ts @@ -117,6 +117,10 @@ class Installer { channel: InstallerChannelsEnum.error, log: this._attempts.toString() }); + this.logger.sendToChannel({ + channel: InstallerChannelsEnum.disk_error, + log: error.message + }); throw error; } }; diff --git a/src/installer/ui/App.tsx b/src/installer/ui/App.tsx index 108666e..757cdb9 100644 --- a/src/installer/ui/App.tsx +++ b/src/installer/ui/App.tsx @@ -1,192 +1,207 @@ -import {useEffect, useRef, useState} from 'react'; +import { useEffect, useRef, useState } from "react"; // Material UI -import Alert from '@mui/material/Alert'; -import Box from '@mui/material/Box'; -import Button from '@mui/material/Button'; -import List from '@mui/material/List'; -import ListItemText from '@mui/material/ListItemText'; -import Typography from '@mui/material/Typography'; +import Alert from "@mui/material/Alert"; +import Box from "@mui/material/Box"; +import Button from "@mui/material/Button"; +import List from "@mui/material/List"; +import ListItemText from "@mui/material/ListItemText"; +import Typography from "@mui/material/Typography"; // Components -import CreateDirLogs from './components/CreateDirLogs'; -import DisclaimerDialog from './components/DisclaimerDialog'; -import DisplayIdentifier from '../../../shared/react-components/DisplayIdentifier'; -import DownloadExtractLogs from './components/DownloadExtractLogs'; -import ExternalLink from '../../../shared/react-components/ExternalLink'; -import TopBar from './components/TopBar'; -import SendIcon from '@mui/icons-material/Send'; -import UIThemeProvider from '../../../shared/react-components/UIThemeProvider'; +import CreateDirLogs from "./components/CreateDirLogs"; +import DisclaimerDialog from "./components/DisclaimerDialog"; +import DisplayIdentifier from "../../../shared/react-components/DisplayIdentifier"; +import DownloadExtractLogs from "./components/DownloadExtractLogs"; +import ExternalLink from "../../../shared/react-components/ExternalLink"; +import TopBar from "./components/TopBar"; +import SendIcon from "@mui/icons-material/Send"; +import UIThemeProvider from "../../../shared/react-components/UIThemeProvider"; // Types import { - NodeChannelsEnum, - FirefoxChannelsEnum, - PointSDKChannelsEnum, - UninstallerChannelsEnum, - InstallerChannelsEnum -} from '../../@types/ipc_channels'; -import DomIds from '../../@types/DOM-el-ids'; + NodeChannelsEnum, + FirefoxChannelsEnum, + PointSDKChannelsEnum, + UninstallerChannelsEnum, + InstallerChannelsEnum, +} from "../../@types/ipc_channels"; +import DomIds from "../../@types/DOM-el-ids"; export default function App() { - const loggerRef = useRef(); - const [disclaimerOpen, setDisclaimerOpen] = useState(true); - const [attempts, setAttempts] = useState(0); - const [installing, setInstalling] = useState(false); - const [version, setVersion] = useState(''); - const [identifier, setIdentifier] = useState(''); + const loggerRef = useRef(); + const [disclaimerOpen, setDisclaimerOpen] = useState(true); + const [attempts, setAttempts] = useState(0); + const [installing, setInstalling] = useState(false); + const [version, setVersion] = useState(""); + const [identifier, setIdentifier] = useState(""); + const [customError, setCustomError] = useState(""); - const getInfo = async () => { - const [dashboardVersion, id] = await Promise.all([ - window.Installer.getDashboardVersion(), - window.Installer.getIdentifier() - ]); - setVersion(dashboardVersion); - setIdentifier(id); - }; - useEffect(() => { - window.Installer.on(InstallerChannelsEnum.error, (_attempt: string) => { - setAttempts(Number(_attempt)); - }); - window.Installer.once(PointSDKChannelsEnum.download, () => { - loggerRef.current?.scrollTo({ - top: loggerRef.current.scrollHeight, - behavior: 'smooth' - }); - }); - getInfo(); - }, []); + const getInfo = async () => { + const [dashboardVersion, id] = await Promise.all([ + window.Installer.getDashboardVersion(), + window.Installer.getIdentifier(), + ]); + setVersion(dashboardVersion); + setIdentifier(id); + }; + useEffect(() => { + window.Installer.on( + InstallerChannelsEnum.disk_error, + (_errorMessage: string) => { + setCustomError(_errorMessage); + if (_errorMessage.indexOf("ENOSPC") > -1) { + setCustomError( + "Please cleanup some disk space to install complete setup successfully." + ); + } + } + ); + window.Installer.on(InstallerChannelsEnum.error, (_attempt: string) => { + setAttempts(Number(_attempt)); + }); + window.Installer.once(PointSDKChannelsEnum.download, () => { + loggerRef.current?.scrollTo({ + top: loggerRef.current.scrollHeight, + behavior: "smooth", + }); + }); + getInfo(); + }, []); - function sendStartInstallation() { - setAttempts(0); - window.Installer.startInstallation(); - setInstalling(true); - } + function sendStartInstallation() { + setCustomError(""); + setAttempts(0); + window.Installer.startInstallation(); + setInstalling(true); + } - return ( - - - - + return ( + + + + - - - - {installing ? 'Installing' : 'Welcome to Point Installer'} - - - v{version} - - + + + + {installing ? "Installing" : "Welcome to Point Installer"} + + + v{version} + + - - - The following components will be installed to run Point Network - - - - Point Engine - Point LiveProfile - Point SDK - Point Browser (Firefox) - Point Uninstaller - - - - - {attempts ? ( - - - - {attempts >= 5 - ? `An error occurred during installation. Please quit and try installing again. Make sure you have a stable internet connection and use a VPN if the internet in your country is censored.` - : `An error occurred during installation. Please try again. Make sure you have a stable internet connection + + + The following components will be installed to run Point Network + + + + Point Engine + Point LiveProfile + Point SDK + Point Browser (Firefox) + Point Uninstaller + + + + + {attempts ? ( + + + + {customError !== "" + ? customError + : attempts >= 5 + ? `An error occurred during installation. Please quit and try installing again. Make sure you have a stable internet connection and use a VPN if the internet in your country is censored.` + : `An error occurred during installation. Please try again. Make sure you have a stable internet connection and use a VPN if the internet in your country is censored.`} - - {attempts >= 5 ? ( - - If you still face issues, feel free to reach out to our support - team{' '} - - window.Installer.openExternalLink( - 'https://pointnetwork.io/support' - ) - } - > - here - {' '} - with your support ID - {identifier} - - ) : null} - {attempts < 5 ? ( - - ) : null} - - - ) : null} - + {attempts >= 5 ? ( + + If you still face issues, feel free to reach out to our + support team{" "} + + window.Installer.openExternalLink( + "https://pointnetwork.io/support" + ) + } + > + here + {" "} + with your support ID - {identifier} + + ) : null} + {attempts < 5 ? ( + + ) : null} + + + ) : null} + + + + + + + + + + + ); } diff --git a/yarn.lock b/yarn.lock index ea12f6a..28e1732 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3474,6 +3474,23 @@ "normalize-path" "^3.0.0" "picomatch" "^2.0.4" +"appdmg@^0.6.0": + "integrity" "sha512-YTilgNF0DF2DSRzGzzGDxaTMLXlhe3b3HB8RAaoJJ/VJXZbOlzIAcZ7gdPniHUVUuHjGwnS7fUMd4FvO2Rp94A==" + "resolved" "https://registry.npmjs.org/appdmg/-/appdmg-0.6.4.tgz" + "version" "0.6.4" + dependencies: + "async" "^1.4.2" + "ds-store" "^0.1.5" + "execa" "^1.0.0" + "fs-temp" "^1.0.0" + "fs-xattr" "^0.3.0" + "image-size" "^0.7.4" + "is-my-json-valid" "^2.20.0" + "minimist" "^1.1.3" + "parse-color" "^1.0.0" + "path-exists" "^4.0.0" + "repeat-string" "^1.5.4" + "append-type@^1.0.1": "integrity" "sha512-hac740vT/SAbrFBLgLIWZqVT5PUAcGTWS5UkDDhr+OCizZSw90WKw6sWAEgGaYd2viIblggypMXwpjzHXOvAQg==" "resolved" "https://registry.npmjs.org/append-type/-/append-type-1.0.2.tgz" @@ -3672,6 +3689,11 @@ dependencies: "retry" "0.13.1" +"async@^1.4.2": + "integrity" "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==" + "resolved" "https://registry.npmjs.org/async/-/async-1.5.2.tgz" + "version" "1.5.2" + "async@^3.2.0": "integrity" "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" "resolved" "https://registry.npmjs.org/async/-/async-3.2.4.tgz" @@ -3906,6 +3928,13 @@ dependencies: "safe-buffer" "^5.0.1" +"base32-encode@^0.1.0 || ^1.0.0": + "integrity" "sha512-cHFU8XeRyx0GgmoWi5qHMCVRiqU6J3MHWxVgun7jggCBUpVzm1Ir7M9dYr2whjSNc3tFeXfQ/oZjQu/4u55h9A==" + "resolved" "https://registry.npmjs.org/base32-encode/-/base32-encode-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "to-data-view" "^1.1.0" + "base64-js@^1.3.1", "base64-js@^1.5.1": "integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" "resolved" "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" @@ -4123,6 +4152,13 @@ "widest-line" "^3.1.0" "wrap-ansi" "^7.0.0" +"bplist-creator@~0.0.3": + "integrity" "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==" + "resolved" "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz" + "version" "0.0.8" + dependencies: + "stream-buffers" "~2.2.0" + "brace-expansion@^1.1.7": "integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" "resolved" "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" @@ -4690,6 +4726,11 @@ dependencies: "color-name" "~1.1.4" +"color-convert@~0.5.0": + "integrity" "sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling==" + "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz" + "version" "0.5.3" + "color-name@~1.1.4": "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" @@ -5672,6 +5713,15 @@ "p-event" "^2.1.0" "pify" "^4.0.1" +"ds-store@^0.1.5": + "integrity" "sha512-kY21M6Lz+76OS3bnCzjdsJSF7LBpLYGCVfavW8TgQD2XkcqIZ86W0y9qUDZu6fp7SIZzqosMDW2zi7zVFfv4hw==" + "resolved" "https://registry.npmjs.org/ds-store/-/ds-store-0.1.6.tgz" + "version" "0.1.6" + dependencies: + "bplist-creator" "~0.0.3" + "macos-alias" "~0.2.5" + "tn1150" "^0.1.0" + "dtrace-provider@~0.8": "integrity" "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==" "resolved" "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz" @@ -5921,6 +5971,11 @@ "resolved" "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz" "version" "3.0.0" +"encode-utf8@^1.0.3": + "integrity" "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" + "resolved" "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz" + "version" "1.0.3" + "encodeurl@^1.0.2", "encodeurl@~1.0.2": "integrity" "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" "resolved" "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" @@ -6839,6 +6894,13 @@ "resolved" "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.13.0.tgz" "version" "0.13.0" +"fmix@^0.1.0": + "integrity" "sha512-Y6hyofImk9JdzU8k5INtTXX1cu8LDlePWDFU5sftm9H+zKCr5SGrVjdhkvsim646cw5zD0nADj8oHyXMZmCZ9w==" + "resolved" "https://registry.npmjs.org/fmix/-/fmix-0.1.0.tgz" + "version" "0.1.0" + dependencies: + "imul" "^1.0.0" + "follow-redirects@^1.0.0", "follow-redirects@^1.14.0", "follow-redirects@^1.14.7": "integrity" "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" "resolved" "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz" @@ -6992,11 +7054,28 @@ "resolved" "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz" "version" "1.0.3" +"fs-temp@^1.0.0": + "integrity" "sha512-okTwLB7/Qsq82G6iN5zZJFsOfZtx2/pqrA7Hk/9fvy+c+eJS9CvgGXT2uNxwnI14BDY9L/jQPkaBgSvlKfSW9w==" + "resolved" "https://registry.npmjs.org/fs-temp/-/fs-temp-1.2.1.tgz" + "version" "1.2.1" + dependencies: + "random-path" "^0.1.0" + +"fs-xattr@^0.3.0": + "integrity" "sha512-UVqkrEW0GfDabw4C3HOrFlxKfx0eeigfRne69FxSBdHIP8Qt5Sq6Pu3RM9KmMlkygtC4pPKkj5CiPO5USnj2GA==" + "resolved" "https://registry.npmjs.org/fs-xattr/-/fs-xattr-0.3.1.tgz" + "version" "0.3.1" + "fs.realpath@^1.0.0": "integrity" "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" "version" "1.0.0" +"fsevents@^2.3.2", "fsevents@~2.3.2": + "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" + "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" + "version" "2.3.2" + "function-bind@^1.1.1": "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -7062,6 +7141,20 @@ "strip-ansi" "^6.0.1" "wide-align" "^1.1.5" +"generate-function@^2.0.0": + "integrity" "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==" + "resolved" "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz" + "version" "2.3.1" + dependencies: + "is-property" "^1.0.2" + +"generate-object-property@^1.1.0": + "integrity" "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==" + "resolved" "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" + "version" "1.2.0" + dependencies: + "is-property" "^1.0.0" + "gensync@^1.0.0-beta.2": "integrity" "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" "resolved" "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" @@ -7817,6 +7910,11 @@ "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" "version" "5.2.0" +"image-size@^0.7.4": + "integrity" "sha512-Hiyv+mXHfFEP7LzUL/llg9RwFxxY+o9N3JVLIeG5E7iFIFAalxvRU9UZthBdYDEVnzHMgjnKJPPpay5BWf1g9g==" + "resolved" "https://registry.npmjs.org/image-size/-/image-size-0.7.5.tgz" + "version" "0.7.5" + "image-size@1.0.1": "integrity" "sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==" "resolved" "https://registry.npmjs.org/image-size/-/image-size-1.0.1.tgz" @@ -7850,6 +7948,11 @@ "pkg-dir" "^4.2.0" "resolve-cwd" "^3.0.0" +"imul@^1.0.0": + "integrity" "sha512-WFAgfwPLAjU66EKt6vRdTlKj4nAgIDQzh29JonLa4Bqtl6D8JrIMvWjCnx7xEjVNmP3U0fM5o8ZObk7d0f62bA==" + "resolved" "https://registry.npmjs.org/imul/-/imul-1.0.1.tgz" + "version" "1.0.1" + "imurmurhash@^0.1.4": "integrity" "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" "resolved" "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" @@ -8143,6 +8246,22 @@ "resolved" "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.1.tgz" "version" "1.1.1" +"is-my-ip-valid@^1.0.0": + "integrity" "sha512-jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==" + "resolved" "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz" + "version" "1.0.1" + +"is-my-json-valid@^2.20.0": + "integrity" "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==" + "resolved" "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz" + "version" "2.20.6" + dependencies: + "generate-function" "^2.0.0" + "generate-object-property" "^1.1.0" + "is-my-ip-valid" "^1.0.0" + "jsonpointer" "^5.0.0" + "xtend" "^4.0.0" + "is-natural-number@^4.0.1": "integrity" "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==" "resolved" "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz" @@ -8207,6 +8326,11 @@ "resolved" "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz" "version" "1.0.1" +"is-property@^1.0.0", "is-property@^1.0.2": + "integrity" "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==" + "resolved" "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" + "version" "1.0.2" + "is-regex@^1.0.4", "is-regex@^1.1.4": "integrity" "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==" "resolved" "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" @@ -9016,6 +9140,11 @@ "resolved" "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz" "version" "1.3.1" +"jsonpointer@^5.0.0": + "integrity" "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==" + "resolved" "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz" + "version" "5.0.1" + "jsonwebtoken@^8.5.1", "jsonwebtoken@8.5.1": "integrity" "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==" "resolved" "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz" @@ -9550,6 +9679,13 @@ "node-gyp-build" "^4.2.1" "readable-stream" "^3.6.0" +"macos-alias@~0.2.5": + "integrity" "sha512-zIUs3+qpml+w3wiRuADutd7XIO8UABqksot10Utl/tji4UxZzLG4fWDC+yJZoO8/Ehg5RqsvSRE/6TS5AEOeWw==" + "resolved" "https://registry.npmjs.org/macos-alias/-/macos-alias-0.2.11.tgz" + "version" "0.2.11" + dependencies: + "nan" "^2.4.0" + "make-dir@^1.0.0": "integrity" "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==" "resolved" "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz" @@ -9809,7 +9945,7 @@ dependencies: "brace-expansion" "^1.1.7" -"minimist@^1.1.0", "minimist@^1.1.1", "minimist@^1.2.0", "minimist@^1.2.5", "minimist@^1.2.6": +"minimist@^1.1.0", "minimist@^1.1.1", "minimist@^1.1.3", "minimist@^1.2.0", "minimist@^1.2.5", "minimist@^1.2.6": "integrity" "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" "version" "1.2.6" @@ -9982,6 +10118,15 @@ "arrify" "^2.0.1" "minimatch" "^3.0.4" +"murmur-32@^0.1.0 || ^0.2.0": + "integrity" "sha512-ZkcWZudylwF+ir3Ld1n7gL6bI2mQAzXvSobPwVtu8aYi2sbXeipeSkdcanRLzIofLcM5F53lGaKm2dk7orBi7Q==" + "resolved" "https://registry.npmjs.org/murmur-32/-/murmur-32-0.2.0.tgz" + "version" "0.2.0" + dependencies: + "encode-utf8" "^1.0.3" + "fmix" "^0.1.0" + "imul" "^1.0.0" + "mute-stream@~0.0.4": "integrity" "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" "resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" @@ -10010,7 +10155,7 @@ "object-assign" "^4.0.1" "thenify-all" "^1.0.0" -"nan@^2.14.0", "nan@^2.14.2": +"nan@^2.14.0", "nan@^2.14.2", "nan@^2.4.0": "integrity" "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==" "resolved" "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz" "version" "2.16.0" @@ -10834,6 +10979,13 @@ dependencies: "author-regex" "^1.0.0" +"parse-color@^1.0.0": + "integrity" "sha512-fuDHYgFHJGbpGMgw9skY/bj3HL/Jrn4l/5rSspy00DoT4RyLnDcRvPxdZ+r6OFwIsgAuhDh4I09tAId4mI12bw==" + "resolved" "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz" + "version" "1.0.0" + dependencies: + "color-convert" "~0.5.0" + "parse-conflict-json@^2.0.1", "parse-conflict-json@^2.0.2": "integrity" "sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==" "resolved" "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz" @@ -11428,6 +11580,14 @@ "resolved" "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz" "version" "5.1.1" +"random-path@^0.1.0": + "integrity" "sha512-4jY0yoEaQ5v9StCl5kZbNIQlg1QheIDBrdkDn53EynpPb9FgO6//p3X/tgMnrC45XN6QZCzU1Xz/+pSSsJBpRw==" + "resolved" "https://registry.npmjs.org/random-path/-/random-path-0.1.2.tgz" + "version" "0.1.2" + dependencies: + "base32-encode" "^0.1.0 || ^1.0.0" + "murmur-32" "^0.1.0 || ^0.2.0" + "randombytes@^2.0.1", "randombytes@^2.1.0": "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==" "resolved" "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz" @@ -11863,6 +12023,11 @@ "lodash" "^4.17.21" "strip-ansi" "^6.0.1" +"repeat-string@^1.5.4": + "integrity" "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==" + "resolved" "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + "version" "1.6.1" + "request@^2.45.0", "request@2.88.2": "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==" "resolved" "https://registry.npmjs.org/request/-/request-2.88.2.tgz" @@ -12796,6 +12961,11 @@ "resolved" "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" "version" "2.0.1" +"stream-buffers@~2.2.0": + "integrity" "sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==" + "resolved" "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz" + "version" "2.2.0" + "stream-shift@^1.0.0": "integrity" "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" "resolved" "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz" @@ -13312,11 +13482,23 @@ "resolved" "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz" "version" "1.0.5" +"tn1150@^0.1.0": + "integrity" "sha512-DbplOfQFkqG5IHcDyyrs/lkvSr3mPUVsFf/RbDppOshs22yTPnSJWEe6FkYd1txAwU/zcnR905ar2fi4kwF29w==" + "resolved" "https://registry.npmjs.org/tn1150/-/tn1150-0.1.0.tgz" + "version" "0.1.0" + dependencies: + "unorm" "^1.4.1" + "to-buffer@^1.1.1": "integrity" "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" "resolved" "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz" "version" "1.1.1" +"to-data-view@^1.1.0": + "integrity" "sha512-1eAdufMg6mwgmlojAx3QeMnzB/BTVp7Tbndi3U7ftcT2zCZadjxkkmLmd97zmaxWi+sgGcgWrokmpEoy0Dn0vQ==" + "resolved" "https://registry.npmjs.org/to-data-view/-/to-data-view-1.1.0.tgz" + "version" "1.1.0" + "to-fast-properties@^2.0.0": "integrity" "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" "resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz" From 51965d7e3aff563749667ba4b7a6aa257ac078c4 Mon Sep 17 00:00:00 2001 From: Danish Date: Fri, 23 Sep 2022 17:44:40 +0500 Subject: [PATCH 3/4] clean --- src/installer/ui/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/ui/App.tsx b/src/installer/ui/App.tsx index 757cdb9..1a3b737 100644 --- a/src/installer/ui/App.tsx +++ b/src/installer/ui/App.tsx @@ -46,7 +46,7 @@ export default function App() { window.Installer.on( InstallerChannelsEnum.disk_error, (_errorMessage: string) => { - setCustomError(_errorMessage); + setCustomError(''); if (_errorMessage.indexOf("ENOSPC") > -1) { setCustomError( "Please cleanup some disk space to install complete setup successfully." From 559a81fa5d36eda46b4a0ec67908ea0a691d19db Mon Sep 17 00:00:00 2001 From: Danish Date: Fri, 30 Sep 2022 16:31:24 +0500 Subject: [PATCH 4/4] error message updated --- src/installer/ui/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/ui/App.tsx b/src/installer/ui/App.tsx index 1a3b737..0e18ff4 100644 --- a/src/installer/ui/App.tsx +++ b/src/installer/ui/App.tsx @@ -49,7 +49,7 @@ export default function App() { setCustomError(''); if (_errorMessage.indexOf("ENOSPC") > -1) { setCustomError( - "Please cleanup some disk space to install complete setup successfully." + "Not enough disk space. You need about 2Gb of space to install the dashboard. Please, try again" ); } }