PersWiFiManager/PersWiFiManager.cpp at master · debsahu/PersWiFiManager · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
/* PersWiFiManager
   version 3.0.1
   https://r-downing.github.io/PersWiFiManager/
*/

#include "PersWiFiManager.h"

#ifdef WIFI_HTM_PROGMEM
const char wifi_htm[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/><title>ESP WiFi</title><script>function g(i){return document.getElementById(i);};function p(t,l){if(confirm(t)) window.location=l;};function E(s){return document.createElement(s)};var S="setAttribute",A="appendChild",H="innerHTML",X,wl;function scan(){if(X) return;X=new XMLHttpRequest(),wl=document.getElementById('wl');wl[H]="Scanning...";X.onreadystatechange=function(){if (this.readyState==4&&this.status==200){X=0;wl[H]="";this.responseText.split("\n").forEach(function (e){let t=e.split(","), s=t.slice(2).join(',');var d=E('div'),i=E('a'),c=E('a');i[S]('class','s'); c[S]('class','q');i.onclick=function(){g('s').value=s;g('p').focus();};i[A](document.createTextNode(s));c[H]=t[0]+"%"+(parseInt(t[1])?"\uD83D\uDD12":"\u26A0");wl[A](i); wl[A](c);wl[A](document.createElement('br'));});}};X.open("GET","wifi/list",true);X.send();};</script><style>input{padding:5px;font-size:1em;width:95%;}body{text-align:center;font-family:verdana;background-color:black;color:white;}a{color:#1fa3ec;}button{border:0;border-radius:0.3em;background-color:#1fa3ec;color:#fff;line-height:2.4em;font-size:1.2em;width:100%;display:block;}.q{float:right;}.s{display:inline-block;width:14em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}#wl{line-height:1.5em;}</style></head><body><div style='text-align:left;display:inline-block;width:320px;padding:5px'><button onclick="scan()">&#x21bb; Scan</button><p id='wl'></p><form method='post' action='/wifi/connect'><input id='s' name='n' length=32 placeholder='SSID'><br><input id='p' name='p' length=64 type='password' placeholder='password'><br><br><button type='submit'>Connect</button></form><br><br><button onclick="p('Reboot device?','/wifi/rst')">Reboot</button><br><a href="javascript:history.back()">Back</a> |<a href="/">Home</a></div></body></html>)=====";
#endif
#ifdef WIFI_HTM_GZ_PROGMEM
#define wifi_htm_gz_len 1103
static const uint8_t wifi_htm_gz[] PROGMEM = {
  0x1f, 0x8b, 0x08, 0x08, 0x3b, 0xdf, 0x37, 0x5c, 0x04, 0x00, 0x69, 0x6e,
  0x64, 0x65, 0x78, 0x31, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0x7d, 0x55, 0xd9,
  0xae, 0xd3, 0x30, 0x10, 0x7d, 0x47, 0xe2, 0x1f, 0x8c, 0x11, 0x24, 0x11,
  0x69, 0xba, 0xb0, 0x08, 0x92, 0xb8, 0x08, 0xb8, 0x85, 0x8b, 0xc4, 0x26,
  0x8a, 0xc4, 0x45, 0x70, 0x1f, 0xdc, 0x64, 0xd2, 0x18, 0x5c, 0x3b, 0xd8,
  0x4e, 0x43, 0x29, 0xfd, 0x77, 0x26, 0x49, 0x5b, 0x0a, 0x08, 0xa4, 0x36,
  0xf5, 0x4c, 0xe7, 0xcc, 0x9c, 0xd9, 0x9c, 0xf4, 0xda, 0xd9, 0xeb, 0x27,
  0xef, 0x3e, 0xbc, 0x99, 0x91, 0xd2, 0xad, 0xe4, 0x34, 0xdd, 0x3f, 0x81,
  0xe7, 0xd3, 0x74, 0x05, 0x8e, 0x13, 0xc5, 0x57, 0xc0, 0xe8, 0x5a, 0x40,
  0x53, 0x69, 0xe3, 0x28, 0xc9, 0xb4, 0x72, 0xa0, 0x1c, 0xa3, 0x8d, 0xc8,
  0x5d, 0xc9, 0x72, 0x58, 0x8b, 0x0c, 0x06, 0x9d, 0x10, 0x12, 0xa1, 0x84,
  0x13, 0x5c, 0x0e, 0x6c, 0xc6, 0x25, 0xb0, 0x71, 0x48, 0x6a, 0x0b, 0xa6,
  0x93, 0xf8, 0x02, 0x15, 0x4a, 0xd3, 0xe1, 0x34, 0x75, 0xc2, 0x49, 0x98,
  0xce, 0xe6, 0x6f, 0xc8, 0x7b, 0xf1, 0x54, 0xa4, 0xc3, 0x5e, 0x4e, 0x6d,
  0x66, 0x44, 0xe5, 0xa6, 0x45, 0xad, 0x32, 0x27, 0xb4, 0x22, 0x4b, 0x5f,
  0x04, 0x5b, 0x03, 0xae, 0x36, 0x8a, 0xe4, 0x3a, 0xab, 0x57, 0x18, 0x35,
  0x5a, 0x82, 0x9b, 0x49, 0x68, 0x8f, 0x8f, 0x37, 0xcf, 0x73, 0xb4, 0x48,
  0x76, 0xc9, 0x11, 0x51, 0xf9, 0x2e, 0x94, 0xc1, 0x56, 0x14, 0x3e, 0x92,
  0x2c, 0x84, 0x59, 0xf9, 0x2e, 0x08, 0x48, 0x23, 0x54, 0xae, 0x9b, 0x48,
  0xea, 0x8c, 0xb7, 0x56, 0x4c, 0x9e, 0x42, 0x66, 0xbe, 0xfd, 0x3b, 0x48,
  0x66, 0x80, 0x3b, 0xd8, 0xc7, 0x41, 0x83, 0x5d, 0xb2, 0xe6, 0x86, 0xcc,
  0x19, 0xb5, 0xe0, 0x1e, 0x39, 0x67, 0xc4, 0xa2, 0x76, 0x40, 0xc3, 0x47,
  0x8c, 0xf2, 0xaa, 0x02, 0x95, 0x3f, 0x29, 0x85, 0xcc, 0x69, 0x78, 0xce,
  0xa8, 0x50, 0x0a, 0xcc, 0xf9, 0xbb, 0x97, 0x2f, 0x68, 0x78, 0x11, 0x36,
  0xf2, 0x57, 0x1c, 0x2c, 0x81, 0xf2, 0x3b, 0x6a, 0x17, 0x01, 0xe9, 0xe3,
  0x25, 0x17, 0x4c, 0x41, 0x43, 0x2e, 0x5e, 0xbe, 0x38, 0x77, 0xae, 0x7a,
  0x0b, 0x5f, 0x6b, 0xb0, 0xce, 0x0f, 0x10, 0xc6, 0xfe, 0x95, 0xae, 0xd7,
  0x48, 0x2f, 0x48, 0x1a, 0xf9, 0xf1, 0xfc, 0x92, 0xd1, 0x39, 0xba, 0x54,
  0x42, 0x2d, 0xa3, 0x28, 0xa2, 0xc9, 0x45, 0xa4, 0x15, 0xb2, 0xce, 0x37,
  0xd6, 0x21, 0xf5, 0xac, 0xe4, 0x6a, 0x09, 0x6c, 0x1f, 0xbd, 0x0f, 0x4c,
  0x7c, 0x57, 0x0a, 0x1b, 0x75, 0x46, 0xf3, 0xd6, 0x88, 0xb1, 0x3b, 0x37,
  0x6f, 0x76, 0xba, 0x16, 0x53, 0x5b, 0xc6, 0x26, 0xa3, 0x51, 0xb0, 0xbd,
  0x60, 0xa3, 0x43, 0x04, 0x9a, 0xec, 0x21, 0xb6, 0xd2, 0xca, 0xc2, 0x3b,
  0xf8, 0xe6, 0x22, 0x5b, 0x49, 0xe1, 0x7c, 0xfa, 0x49, 0xd1, 0x20, 0x2a,
  0xb4, 0x99, 0xf1, 0xac, 0xf4, 0x8f, 0x59, 0xfa, 0x10, 0x6c, 0x25, 0x38,
  0xe2, 0x18, 0x1c, 0x0c, 0x43, 0x1a, 0x84, 0xc4, 0x32, 0x04, 0x4a, 0x9c,
  0x13, 0x7f, 0x12, 0x44, 0x9f, 0xb5, 0x50, 0xbe, 0x17, 0x7a, 0x41, 0x57,
  0xd5, 0x9c, 0xcd, 0x7c, 0x2f, 0x17, 0x6b, 0x2f, 0x08, 0x45, 0x7b, 0xe4,
  0x78, 0xc8, 0xf6, 0x87, 0x44, 0x7c, 0x9c, 0x5f, 0xfa, 0x5e, 0x26, 0xb9,
  0xb5, 0x08, 0xb0, 0xa8, 0x21, 0xd9, 0x6f, 0xaa, 0xaf, 0xad, 0x11, 0xa6,
  0x9e, 0xa1, 0xf3, 0x2f, 0xa7, 0xf9, 0x2e, 0xfd, 0xd6, 0x3c, 0x5a, 0x73,
  0x59, 0x03, 0xb3, 0x09, 0x8a, 0x15, 0x8a, 0x05, 0xd6, 0xd5, 0xfa, 0x38,
  0x33, 0xe8, 0xf9, 0xd1, 0xa5, 0xff, 0x7b, 0xc3, 0xbb, 0xfc, 0x5e, 0xe9,
  0x1c, 0xb0, 0xe3, 0x41, 0x92, 0xb5, 0x15, 0x70, 0x1f, 0x47, 0x97, 0xb7,
  0xe8, 0x0d, 0x7a, 0xcb, 0xaf, 0xb8, 0xb1, 0xf0, 0x1c, 0xa7, 0xc1, 0x7d,
  0x1c, 0x5f, 0x06, 0x0f, 0xe9, 0xa7, 0xfa, 0xec, 0xfe, 0xed, 0x33, 0x7c,
  0x9e, 0x8d, 0x27, 0x34, 0x46, 0x71, 0x72, 0xef, 0xd1, 0x88, 0xb6, 0xbd,
  0x69, 0x1d, 0x0b, 0x24, 0xda, 0x9f, 0xb2, 0x83, 0xea, 0x1f, 0xc3, 0xe5,
  0x2d, 0x8c, 0x87, 0xd1, 0x76, 0xf8, 0xd9, 0xb5, 0x4d, 0xc4, 0x71, 0xf2,
  0xe9, 0xb3, 0xd9, 0x3b, 0xac, 0x5b, 0x23, 0x0a, 0x31, 0x94, 0xc2, 0x3a,
  0x1a, 0x3a, 0x53, 0x43, 0x80, 0x7f, 0x5b, 0x1c, 0xb6, 0x8e, 0x7e, 0x3a,
  0xdc, 0x6f, 0x4b, 0x6a, 0xdd, 0x06, 0x97, 0x47, 0xa8, 0xaa, 0x76, 0xdb,
  0x8a, 0xe7, 0x39, 0x0e, 0x44, 0x7c, 0xb7, 0xfa, 0x96, 0x14, 0xb8, 0xa6,
  0x03, 0x2b, 0xbe, 0x43, 0x3c, 0x86, 0x55, 0xd2, 0xad, 0x67, 0xfc, 0xe0,
  0xee, 0x8d, 0x64, 0xb7, 0xd0, 0xf9, 0x66, 0xeb, 0x30, 0xd5, 0x01, 0x97,
  0x62, 0xa9, 0xe2, 0x0c, 0x69, 0x80, 0xe9, 0xed, 0x0b, 0xbe, 0x12, 0x72,
  0x13, 0xaf, 0xc1, 0xe4, 0x5c, 0xf1, 0x64, 0xc1, 0xb3, 0x2f, 0x4b, 0xa3,
  0x6b, 0x95, 0x0f, 0x32, 0x2d, 0xb5, 0x89, 0x17, 0x12, 0x35, 0x49, 0x7f,
  0x6e, 0x4a, 0xe1, 0x20, 0xd9, 0xf1, 0x6d, 0x2f, 0x5e, 0x1f, 0x17, 0xfc,
  0x36, 0x64, 0xe8, 0xbf, 0x76, 0x4e, 0xab, 0xed, 0x42, 0x9b, 0x1c, 0x4c,
  0x3c, 0x4a, 0xfa, 0xc3, 0xc0, 0xf0, 0x5c, 0xd4, 0x36, 0x1e, 0x45, 0xb7,
  0x61, 0xf5, 0xa7, 0xe3, 0x5f, 0xe8, 0xbd, 0x54, 0x14, 0x45, 0x22, 0x85,
  0x82, 0x41, 0x09, 0x62, 0x59, 0xba, 0x78, 0x12, 0xdd, 0x41, 0xd4, 0x49,
  0x4a, 0xd1, 0xe4, 0x98, 0xd4, 0x78, 0x34, 0xba, 0x91, 0xe4, 0x02, 0xc7,
  0x8d, 0x6f, 0x90, 0xa0, 0x46, 0x82, 0xbb, 0xe8, 0xeb, 0xb6, 0x90, 0x9a,
  0xbb, 0xd8, 0xb4, 0x70, 0x94, 0xed, 0xf6, 0x60, 0x21, 0x54, 0xe7, 0xb8,
  0x33, 0x3c, 0x78, 0x68, 0x9d, 0x6b, 0x4c, 0x1a, 0x31, 0x4d, 0x5c, 0x8a,
  0x3c, 0x07, 0x95, 0x74, 0x15, 0x3a, 0x2a, 0x41, 0x4a, 0x51, 0x59, 0x61,
  0x93, 0x2e, 0xeb, 0x81, 0xad, 0x78, 0x06, 0xb1, 0xd2, 0x8d, 0xe1, 0x55,
  0xb2, 0xbb, 0xde, 0xc8, 0xed, 0x09, 0x5b, 0x64, 0x77, 0x17, 0x1d, 0xee,
  0xd2, 0x61, 0xdf, 0x9b, 0x74, 0xd8, 0xdf, 0xa6, 0x6d, 0xe1, 0xa7, 0x29,
  0x8e, 0x3a, 0xe9, 0xf4, 0xcc, 0x3b, 0x69, 0x82, 0x84, 0xc2, 0x25, 0xff,
  0xa1, 0x78, 0x7b, 0x32, 0xc2, 0x9e, 0x9e, 0xf4, 0xd7, 0x43, 0x7f, 0x5d,
  0xa1, 0xc9, 0x61, 0xf8, 0x69, 0x7f, 0xc5, 0xd0, 0xe9, 0xcd, 0xeb, 0xdf,
  0x26, 0xe3, 0xc5, 0x22, 0x21, 0xed, 0x05, 0x91, 0x0e, 0x7b, 0xb3, 0x69,
  0x5a, 0x11, 0x91, 0xb3, 0xf6, 0x02, 0x41, 0x42, 0xd5, 0x34, 0xc5, 0xdd,
  0x5d, 0x11, 0xbc, 0xe0, 0x4b, 0x8d, 0xda, 0x4a, 0x5b, 0xe7, 0x11, 0xde,
  0x2d, 0x0f, 0xf3, 0x86, 0xdd, 0xe4, 0x65, 0x1a, 0xef, 0xb2, 0xcc, 0xa1,
  0x79, 0x37, 0x5c, 0x1d, 0xda, 0x7a, 0xfd, 0xeb, 0xc0, 0x53, 0x1e, 0x91,
  0xa0, 0x96, 0x78, 0xff, 0xdf, 0x9e, 0x10, 0x24, 0x9d, 0x41, 0xa9, 0x25,
  0xb6, 0x99, 0x79, 0xf3, 0xf9, 0xf3, 0xb3, 0x96, 0x9c, 0x39, 0xc5, 0x55,
  0x07, 0x5c, 0x75, 0xc4, 0xdd, 0xbb, 0x43, 0xdc, 0xa6, 0x6a, 0x55, 0xb8,
  0xc9, 0x0d, 0xce, 0x88, 0x77, 0xea, 0xe7, 0x97, 0xba, 0xf3, 0xd5, 0x7e,
  0x0f, 0x09, 0xef, 0x61, 0xb6, 0x5e, 0xac, 0x04, 0xb2, 0x7b, 0xd2, 0xd3,
  0xfc, 0x95, 0xe7, 0xb0, 0xcd, 0xec, 0x00, 0xfa, 0xbb, 0x4a, 0x95, 0xef,
  0xbd, 0x85, 0x85, 0xd6, 0x8e, 0xf4, 0x6f, 0xae, 0x87, 0x5e, 0xb8, 0x4f,
  0xd8, 0x60, 0x0d, 0xb0, 0x7c, 0xdd, 0xbf, 0x47, 0x7f, 0xbd, 0x13, 0x4e,
  0x4a, 0x03, 0x05, 0xa3, 0x9f, 0xf9, 0x9a, 0xf7, 0x8b, 0x17, 0x97, 0xb8,
  0x98, 0xda, 0x6c, 0xa2, 0x76, 0x94, 0xdb, 0xaa, 0x3f, 0xc6, 0xdf, 0x74,
  0xc8, 0xa7, 0xe4, 0xc7, 0xd1, 0x7a, 0x48, 0xa7, 0xe7, 0x7a, 0x05, 0xa8,
  0x45, 0x56, 0xd8, 0x77, 0x7c, 0xf6, 0x33, 0x30, 0xec, 0x5e, 0xb2, 0x57,
  0xaf, 0xfc, 0x04, 0x35, 0x76, 0x39, 0x90, 0x7c, 0x07, 0x00, 0x00
};
#endif

PersWiFiManager::PersWiFiManager(AsyncWebServer &s, AsyncDNSServer &d, const fs::FS& fs):_fs(fs)
{
  _aserver = &s;
  _adnsServer = &d;
  _apPass = "";
} //PersWiFiManager

bool PersWiFiManager::attemptConnection(const String &ssid, const String &pass)
{
  //attempt to connect to wifi
  WiFi.mode(WIFI_STA);
  if (ssid.length())
  {
    if(Serial) Serial.printf("Connecting to SSID: %s\n", ssid.c_str());
    if (pass.length())
      WiFi.begin(ssid.c_str(), pass.c_str());
    else
      WiFi.begin(ssid.c_str());
  }
  else
  {
    if(Serial) Serial.printf("Connecting to previously stored WiFi credentials.\n");
    WiFi.begin();
  }

  _connectStartTime = millis();

  _tkWiFiH.attach_ms(10, std::bind(&PersWiFiManager::handleWiFi, this));

  return (WiFi.status() == WL_CONNECTED);

} //attemptConnection

void PersWiFiManager::handleWiFi()
{
  if (!_connectStartTime)
    return;

  if (WiFi.status() == WL_CONNECTED)
  {
    _connectStartTime = 0;
    if (_connectHandler)
      _connectHandler();
    return;
    if (Serial) {
      Serial.print("Router IP: ");
      Serial.println(WiFi.localIP());
    }
  }

  //if failed or not connected and time is up
  if ((WiFi.status() == WL_CONNECT_FAILED) || ((WiFi.status() != WL_CONNECTED) && ((millis() - _connectStartTime) > (1000 * WIFI_CONNECT_TIMEOUT))))
  {
    startApMode();
    _connectStartTime = 0; //reset connect start time
  }

} //handleWiFi

void PersWiFiManager::startApMode()
{
  //start AP mode
  IPAddress apIP(192, 168, 1, 1);
  WiFi.mode(WIFI_AP);
  WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
  _apPass.length() ? WiFi.softAP(getApSsid().c_str(), _apPass.c_str()) : WiFi.softAP(getApSsid().c_str());
  if(Serial) {
    Serial.print("Started AP mode, IP: ");
    Serial.println(WiFi.softAPIP());
    Serial.println("--------------");
  }
  if (_apHandler)
    _apHandler();
} //startApMode

void PersWiFiManager::setConnectNonBlock(bool b)
{
  if(Serial) Serial.println("\n>>>>>>>>>>Does not do anything, non-blocking mode is default<<<<<<<<<<<<");
  _connectNonBlock = b;
} //setConnectNonBlock

void PersWiFiManager::setupWiFiHandlers()
{
  if (Serial)
  {
    Serial.println("\n\n---------------------------");
    Serial.println("Starting SPIFFs...");
  }

  if (_fs.begin())
  {
    Dir dir = _fs.openDir("/");
    while (dir.next())
    {
      String fileName = dir.fileName();
      size_t fileSize = dir.fileSize();
      if (Serial)
        Serial.printf("FS File: %s, size: %dB\n", fileName.c_str(), fileSize);
    }

    FSInfo fs_info;
    _fs.info(fs_info);
    if (Serial)
    {
      Serial.printf("FS Usage: %d/%d bytes\n\n", fs_info.usedBytes, fs_info.totalBytes);
      Serial.println("SPIFFs started");
    }
  }

  IPAddress apIP(192, 168, 1, 1);
  _adnsServer->setErrorReplyCode(AsyncDNSReplyCode::NoError);
  _adnsServer->start((byte)53, "*", apIP); //used for captive portal in AP mode

  _aserver->on("/wifi/list", HTTP_GET, [](AsyncWebServerRequest *request) {
    //scan for wifi networks
    String s = "Scan again after 3-5s";
    s.reserve(2050);

    int n = WiFi.scanComplete();
    if (n == -2)
    {
      WiFi.scanNetworks(true);
    }
    else if (n)
    {
      //build array of indices
      int ix[n];
      for (int i = 0; i < n; i++)
        ix[i] = i;

      //sort by signal strength
      for (int i = 0; i < n; i++)
        for (int j = 1; j < n - i; j++)
          if (WiFi.RSSI(ix[j]) > WiFi.RSSI(ix[j - 1]))
            std::swap(ix[j], ix[j - 1]);
      //remove duplicates
      for (int i = 0; i < n; i++)
        for (int j = i + 1; j < n; j++)
          if (WiFi.SSID(ix[i]).equals(WiFi.SSID(ix[j])) && WiFi.encryptionType(ix[i]) == WiFi.encryptionType(ix[j]))
            ix[j] = -1;

      //build plain text string of wifi info
      //format [signal%]:[encrypted 0 or 1]:SSID
      s="";
      for (int i = 0; i < n && s.length() < 2000; i++)
      { //check s.length to limit memory usage
        if (ix[i] != -1)
        {
          s += String(i ? "\n" : "") + ((constrain(WiFi.RSSI(ix[i]), -100, -50) + 100) * 2) + "," + ((WiFi.encryptionType(ix[i]) == ENC_TYPE_NONE) ? 0 : 1) + "," + WiFi.SSID(ix[i]);
        }
      }
      WiFi.scanDelete();
      if (WiFi.scanComplete() == -2)
      {
        WiFi.scanNetworks(true);
      }
    }
    if (Serial)
    {
      Serial.print("Sending >>>>>>>>>>>>>\n");
      Serial.println(s);
      Serial.println("<<<<<<<<<<<<<<<<<<<<<");
    }

    //send string to client
    request->send(200, "text/plain", s);
    s = String();
  }); //_aserver->on /wifi/list

  _aserver->on("/wifi/connect", HTTP_POST, [&](AsyncWebServerRequest *request) {
    request->send(200, "text/html", "<META http-equiv='refresh' content='15;URL=/'> Connecting...");
    if (request->hasArg("n") and request->hasArg("p"))
      attemptConnection(request->arg("n"), request->arg("p"));
  }); //_aserver->on /wifi/connect

  _aserver->on("/wifi/ap", HTTP_GET, [&](AsyncWebServerRequest *request) {
    request->send(200, "text/html", "<META http-equiv='refresh' content='15;URL=/'> Access point: " + getApSsid());
    startApMode();
  }); //_aserver->on /wifi/ap

  _aserver->on("/wifi/restart", HTTP_GET, [](AsyncWebServerRequest *request) {
    request->send(200, "text/html", "<META http-equiv='refresh' content='15;URL=/'> Rebooting...");
    //delay(100);
    //ESP.restart();
    // Adding Safer Restart method
    ESP.wdtDisable();
    ESP.reset();
  }); //_aserver->on /wifi/restart

  _aserver->on("/wifi/reset", HTTP_GET, [](AsyncWebServerRequest *request) {
    request->send(200, "text/html", "<META http-equiv='refresh' content='15;URL=/'> Erasing WiFi credentials and Rebooting...");
    WiFi.disconnect(); //erases wifi credentials
    ESP.wdtDisable();
    ESP.reset();
  }); //_aserver->on /wifi/reset


  _aserver->addHandler(new SPIFFSEditor(_fsUser, _fsPass));

  _aserver->onNotFound([&](AsyncWebServerRequest *request) {
    String filename = request->url();
    String ContentType = "text/plain";

    if (filename.endsWith(".htm"))
      ContentType = "text/html";
    else if (filename.endsWith(".html"))
      ContentType = "text/html";
    else if (filename.endsWith(".css"))
      ContentType = "text/css";
    else if (filename.endsWith(".js"))
      ContentType = "application/javascript";
    else if (filename.endsWith(".png"))
      ContentType = "image/png";
    else if (filename.endsWith(".gif"))
      ContentType = "image/gif";
    else if (filename.endsWith(".jpg"))
      ContentType = "image/jpeg";
    else if (filename.endsWith(".ico"))
      ContentType = "image/x-icon";
    else if (filename.endsWith(".xml"))
      ContentType = "text/xml";
    else if (filename.endsWith(".pdf"))
      ContentType = "application/x-pdf";
    else if (filename.endsWith(".zip"))
      ContentType = "application/x-zip";
    else if (filename.endsWith(".gz"))
      ContentType = "application/x-gzip";
    else if (filename.endsWith("ico.gz"))
      ContentType = "image/x-icon";

    if (_fs.exists(filename + ".gz") || _fs.exists(filename))
    {
      if (_fs.exists(filename + ".gz"))
        filename += ".gz";
      AsyncWebServerResponse *response = request->beginResponse(SPIFFS, filename, ContentType);
      if (filename.endsWith(".gz"))
        response->addHeader("Content-Encoding", "gzip");
      request->send(response);
      return;
    }

    request->redirect("/wifi"); // send all DNS requests to wifi
  });

#ifdef WIFI_HTM_PROGMEM
  _aserver->on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request) {
    request->send_P(200, "text/html", wifi_htm);
  });
#endif

#ifdef WIFI_HTM_GZ_PROGMEM
  _aserver->on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request) {
    AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", wifi_htm_gz, wifi_htm_gz_len);
    response->addHeader("Content-Encoding", "gzip");
    request->send(response);
  });
#endif

} //setupWiFiHandlers

void PersWiFiManager::setFSCredentials(const String &http_user, const String &http_pass)
{
  if (http_user.length())
    _fsUser = http_user;
  if (http_pass.length() >= 8)
    _fsPass = http_pass;
} //setApCredentials

bool PersWiFiManager::begin(const String &ssid, const String &pass)
{
  setupWiFiHandlers();
  return attemptConnection(ssid, pass); //switched order of these two for return
} //begin

String PersWiFiManager::getApSsid()
{
  return _apSsid.length() ? _apSsid : "ESP8266";
} //getApSsid

void PersWiFiManager::setApCredentials(const String &apSsid, const String &apPass)
{
  if (apSsid.length())
    _apSsid = apSsid;
  if (apPass.length() >= 8)
    _apPass = apPass;
} //setApCredentials

void PersWiFiManager::onConnect(WiFiChangeHandlerFunction fn)
{
  _connectHandler = fn;
}

void PersWiFiManager::onAp(WiFiChangeHandlerFunction fn)
{
  _apHandler = fn;
}