diff --git a/src/App.svelte b/src/App.svelte index 9f4d7a3..14c7a42 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -36,8 +36,6 @@ //let myip = document.location.hostname; let myip = "192.168.88.235"; - function promiseResolve() {} - //Flags let showInput = false; let showModalFlag = false; @@ -809,6 +807,25 @@ errorsJson[alarmKey] = 0; wsSendMsg(selectedWs, '/rorre|{"' + alarmKey + '":0}'); } + + //*******************************************************awaiting********************************************************************/ + + let promiseResolve; + let myPromise = 0; + + async function connect() { + console.log("connect start"); + saveSettings(); + return new Promise(function (resolve, reject) { + setTimeout(() => reject(), 10000); + promiseResolve = resolve; + }); + } + + function activate() { + myPromise = connect(); + } + //*******************************************************initialisation********************************************************************/ onMount(async () => { console.log("[i]", "mounted"); @@ -890,7 +907,7 @@ saveConfig()} /> - promiseResolve()} ssidJson={ssidJson} rebootEsp={() => rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} mqttConnect={() => mqttConnect()} /> + activate()} 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 31b9c41..2f0a7cb 100644 --- a/src/pages/Connection.svelte +++ b/src/pages/Connection.svelte @@ -3,30 +3,12 @@ import Alarm from "../components/Alarm.svelte"; export let settingsJson; - //export let settingsJsonParced; export let errorsJson; - export let errorsJsonParced; export let ssidJson; - //export let ssidJsonParced; - export let promiseResolve = () => {}; + export let myPromise; - 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 = () => new Promise((resolve) => setTimeout(() => resolve(), 1000)); + export let activate = () => {}; export let ssidDropdownClick = () => {}; export let saveSettings = () => {}; @@ -36,7 +18,7 @@ {#await myPromise}

Connecting...

- + {:then}
@@ -92,7 +74,7 @@
{/if} - +