diff --git a/src/App.svelte b/src/App.svelte index 6368246..9f4d7a3 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -36,6 +36,8 @@ //let myip = document.location.hostname; let myip = "192.168.88.235"; + function promiseResolve() {} + //Flags let showInput = false; let showModalFlag = false; @@ -287,6 +289,7 @@ //delete errorsJson.errors; errorsJson = errorsJson; errorsJsonParced = true; + promiseResolve(); if (debug) console.log("✔", "errorsJson json parced"); } } @@ -887,7 +890,7 @@ saveConfig()} /> - rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} mqttConnect={() => mqttConnect()} /> + promiseResolve()} ssidJson={ssidJson} rebootEsp={() => rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} mqttConnect={() => mqttConnect()} /> rebootEsp()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} version={version} /> diff --git a/src/pages/Connection.svelte b/src/pages/Connection.svelte index 65bea2d..31b9c41 100644 --- a/src/pages/Connection.svelte +++ b/src/pages/Connection.svelte @@ -5,12 +5,28 @@ export let settingsJson; //export let settingsJsonParced; export let errorsJson; - //export let errorsJsonParced; + export let errorsJsonParced; export let ssidJson; //export let ssidJsonParced; + export let promiseResolve = () => {}; + + async function connect() { + console.log("connect start"); + errorsJsonParced = false; + saveSettings(); + console.log("errorsJsonParced:", errorsJsonParced); + return new Promise(function (resolve, reject) { + //установим таймаут на 1 секунду, если пройдет секнда и не будет resolve() то система выдаст ошибку + setTimeout(() => reject(), 20000); + promiseResolve = resolve; + }); + } + + let myPromise = 0; //connect(); + let promise = 0; - let next = (value) => new Promise((resolve) => setTimeout(() => resolve(++value), 500)); + let next = () => new Promise((resolve) => setTimeout(() => resolve(), 1000)); export let ssidDropdownClick = () => {}; export let saveSettings = () => {}; @@ -18,9 +34,10 @@ export let rebootEsp = () => {}; -{#await promise} -

...

-{:then result} +{#await myPromise} +

Connecting...

+ +{:then}
@@ -74,7 +91,8 @@
{/if} - + +
@@ -141,4 +159,6 @@
+{:catch} +

error

{/await}